[commit: packages/directory] Mistuke-bump-win32-version-bounds, bgamari-patch-1, cbits, master: Move HsDirectoryConfig.h to root directory (1d94ce6)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/directory

On branches: Mistuke-bump-win32-version-bounds,bgamari-patch-1,cbits,master
Link       : http://ghc.haskell.org/trac/ghc/changeset/1d94ce6a4b594e6d01666d1326993d612d35c9eb/directory

>---------------------------------------------------------------

commit 1d94ce6a4b594e6d01666d1326993d612d35c9eb
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Wed Apr 27 00:59:11 2016 -0400

    Move HsDirectoryConfig.h to root directory
    
    This is avoids the need to create the "include" directory whenever
    autoreconf is initially run from a fresh repo, as once HsDirectory.h is
    removed later on there will no longer be an "include" directory in the
    Git repo.  (We could of course create a dummy file to keep the "include"
    directory, but that adds unnecessary clutter to the Git tree.)


>---------------------------------------------------------------

1d94ce6a4b594e6d01666d1326993d612d35c9eb
 .gitignore       | 4 ++--
 configure.ac     | 2 +-
 directory.cabal  | 6 +++---
 tools/testscript | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index ad4e1bf..590cba3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,8 +5,8 @@ config.log
 config.status
 configure
 dist/
-include/HsDirectoryConfig.h
-include/HsDirectoryConfig.h.in
+HsDirectoryConfig.h
+HsDirectoryConfig.h.in
 *~
 
 # In GHC build tree:
diff --git a/configure.ac b/configure.ac
index 68a1cf9..3999681 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_INIT([Haskell directory package], [1.0], [libraries at haskell.org], [directory]
 # Safety check: Ensure that we are in the correct source directory.
 AC_CONFIG_SRCDIR([System/Directory.hs])
 
-AC_CONFIG_HEADERS([include/HsDirectoryConfig.h])
+AC_CONFIG_HEADERS([HsDirectoryConfig.h])
 
 # Autoconf chokes on spaces, but we may receive a path from Cabal containing
 # spaces.  In that case, we just ignore Cabal's suggestion.
diff --git a/directory.cabal b/directory.cabal
index a03cb67..27f528f 100644
--- a/directory.cabal
+++ b/directory.cabal
@@ -18,7 +18,7 @@ extra-tmp-files:
     autom4te.cache
     config.log
     config.status
-    include/HsDirectoryConfig.h
+    HsDirectoryConfig.h
 
 extra-source-files:
     changelog.md
@@ -26,7 +26,7 @@ extra-source-files:
     configure
     configure.ac
     directory.buildinfo
-    include/HsDirectoryConfig.h.in
+    HsDirectoryConfig.h.in
     tests/*.hs
     tests/util.inl
 
@@ -51,7 +51,7 @@ Library
 
     c-sources:
         cbits/directory.c
-    include-dirs: include
+    include-dirs: . include
     includes:
         HsDirectory.h
     install-includes:
diff --git a/tools/testscript b/tools/testscript
index e71aac0..1df340d 100755
--- a/tools/testscript
+++ b/tools/testscript
@@ -6,7 +6,7 @@ testflags="CreateDirectoryIfMissing001.num-repeats=100000 +RTS -N2"
 
 post_configure() {
     if [ "${DISABLE_UTIMENSAT+x}" ]; then
-        sed -i "s/#define HAVE_UTIMENSAT 1//" include/HsDirectoryConfig.h
+        sed -i "s/#define HAVE_UTIMENSAT 1//" HsDirectoryConfig.h
     fi
 }