[commit: ghc] master: Don't delete HsTimeConfig.h.in during distclean. (94c35dd)

git at git.haskell.org git at git.haskell.org
Thu Aug 15 03:03:05 CEST 2013


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/94c35ddf31aef28de84661860f77a94229f60cb4/ghc

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

commit 94c35ddf31aef28de84661860f77a94229f60cb4
Author: Austin Seipp <aseipp at pobox.com>
Date:   Wed Aug 14 16:49:52 2013 -0500

    Don't delete HsTimeConfig.h.in during distclean.
    
    sdist preps the tree via distclean before anything else, which caused
    HsTimeConfig.h.in under 'time' to be deleted - even though it should be
    included in the resulting tarball for ./configure.
    
    The correct target is 'maintainer-clean'.
    
    I'm guessing the nightlies didn't complain because they run ./boot,
    forcing regeneration. NixOS's Hydra does not, though.
    
    Thanks to Peter Simons and Andres Löh for pointing this out.
    
    Signed-off-by: Austin Seipp <aseipp at pobox.com>


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

94c35ddf31aef28de84661860f77a94229f60cb4
 ghc.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ghc.mk b/ghc.mk
index 0e18618..82e9e5c 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -1283,7 +1283,6 @@ distclean : clean
 	$(call removeFiles,libraries/process/include/HsProcessConfig.h)
 	$(call removeFiles,libraries/unix/include/HsUnixConfig.h)
 	$(call removeFiles,libraries/time/include/HsTimeConfig.h)
-	$(call removeFiles,libraries/time/include/HsTimeConfig.h.in)
 	$(call removeFiles,libraries/old-time/include/HsTimeConfig.h)
 
 # The library configure scripts also like creating autom4te.cache
@@ -1312,6 +1311,7 @@ maintainer-clean : distclean
 	$(call removeFiles,libraries/directory/include/HsDirectoryConfig.h.in)
 	$(call removeFiles,libraries/process/include/HsProcessConfig.h.in)
 	$(call removeFiles,libraries/unix/include/HsUnixConfig.h.in)
+	$(call removeFiles,libraries/time/include/HsTimeConfig.h.in)
 	$(call removeFiles,libraries/old-time/include/HsTimeConfig.h.in)
 
 .PHONY: all_libraries





More information about the ghc-commits mailing list