Skip to content

Commit

Permalink
Move HsDirectoryConfig.h to root directory
Browse files Browse the repository at this point in the history
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.)
  • Loading branch information
Rufflewind committed Apr 27, 2016
1 parent e938629 commit 1d94ce6
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ AC_INIT([Haskell directory package], [1.0], [[email protected]], [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.
Expand Down
6 changes: 3 additions & 3 deletions directory.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ extra-tmp-files:
autom4te.cache
config.log
config.status
include/HsDirectoryConfig.h
HsDirectoryConfig.h

extra-source-files:
changelog.md
README.md
configure
configure.ac
directory.buildinfo
include/HsDirectoryConfig.h.in
HsDirectoryConfig.h.in
tests/*.hs
tests/util.inl

Expand All @@ -51,7 +51,7 @@ Library

c-sources:
cbits/directory.c
include-dirs: include
include-dirs: . include
includes:
HsDirectory.h
install-includes:
Expand Down
2 changes: 1 addition & 1 deletion tools/testscript
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down

0 comments on commit 1d94ce6

Please sign in to comment.