Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/58172f24cef0ab2c3646e3d95ecc8019285a7511

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

commit 58172f24cef0ab2c3646e3d95ecc8019285a7511
Author: Simon Peyton Jones <[email protected]>
Date:   Fri Jan 20 10:47:55 2012 +0000

    Don't read boilerplate.mk on 'make maintainer-clean'

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

 Makefile         |    2 ++
 timeout/Makefile |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/Makefile b/Makefile
index 97ee47f..c3db8db 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,7 @@ TOP = .
 # being defined.
 ifneq "$(MAKECMDGOALS)" "clean"
 ifneq "$(MAKECMDGOALS)" "distclean"
+ifneq "$(MAKECMDGOALS)" "maintainer-clean"
 
 include $(TOP)/mk/boilerplate.mk
 
@@ -18,6 +19,7 @@ all:
 
 endif
 endif
+endif
 
 clean distclean maintainer-clean:
        $(MAKE) -C $(TOP)/timeout $@
diff --git a/timeout/Makefile b/timeout/Makefile
index 4b203cc..e7335df 100644
--- a/timeout/Makefile
+++ b/timeout/Makefile
@@ -7,6 +7,7 @@ TOP = ..
 # being defined.
 ifneq "$(MAKECMDGOALS)" "clean"
 ifneq "$(MAKECMDGOALS)" "distclean"
+ifneq "$(MAKECMDGOALS)" "maintainer-clean"
 
 include $(TOP)/mk/boilerplate.mk
 
@@ -58,6 +59,7 @@ calibrate.out:
 
 endif
 endif
+endif
 
 clean distclean maintainer-clean:
        -./Setup clean



_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to