X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=4eb83e76faeb6af9e2c84728db111eba673530a3;hb=e802f7a7f88d9cc71472f8296f9e2d72e4f82b13;hp=e14d07f328ce37cea2e050063692555fd4c27ddb;hpb=42aba9684fe790a58b712aa5cd8494ebdf048969;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index e14d07f..4eb83e7 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ endif
 
 ifneq "$(Project)" ""
    ifeq "$(Project)" "GreenCard"
-       ProjectDirectory=green-card
+       ProjectDirectory=greencard
    else
 	ifeq "$(Project)" "HaskellDirect"
 		ProjectDirectory=hdirect
@@ -48,6 +48,9 @@ project-check :
 
 DIST_CLEAN_FILES += config.cache config.status
 
+extraclean::
+	$(RM) -rf autom4te.cache
+
 #
 # If you've ended up using an in-place version of Happy,
 # make sure it gets built early on.
@@ -167,7 +170,7 @@ BIN_DIST_DIRS=$($(Project)BinDistDirs)
 binary-dist:: binary-dist-pre
 
 BIN_DIST_TOP= distrib/Makefile-bin.in \
-	      distrib/configure-bin.in \
+	      distrib/configure-bin.ac \
 	      distrib/INSTALL \
 	      $(BIN_DIST_MAIN_DIR)/ANNOUNCE \
 	      $(BIN_DIST_MAIN_DIR)/VERSION \
@@ -191,7 +194,7 @@ BIN_DIST_TMPDIR=$(FPTOOLS_TOP_ABS)
 
 binary-dist-pre::
 ifeq "$(BIN_DIST)" ""
-	echo "WARNING: To run the binary-dist target, you need to set BIN_DIST=1 in your build.mk" && exit 1
+	@echo "WARNING: To run the binary-dist target, you need to set BIN_DIST=1 in your build.mk" && exit 1
 endif
 	-rm -rf $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)
 	-$(RM) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME).tar.gz
@@ -239,7 +242,7 @@ binary-dist::
 	echo "PACKAGE_LINKS = $($(Project)BinDistLinks)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
 	cat $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile-bin.in >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
 	@echo "Generating a shippable configure script.."
-	$(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/configure-bin.in $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/configure.in 
+	$(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/configure-bin.ac $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/configure.ac
 	( cd $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME); autoconf )
 	if test -x $(BIN_DIST_MAIN_DIR)/mk/post-install-script ; then \
 		cp $(BIN_DIST_MAIN_DIR)/mk/post-install-script \
@@ -349,8 +352,8 @@ SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME)
 #
 SRC_DIST_DIRS += docs distrib $(SUBDIRS)
 SRC_DIST_FILES += \
-	configure.in config.guess config.sub configure \
-	aclocal.m4 acconfig.h README Makefile Makefile.config install-sh \
+	configure.ac config.guess config.sub configure \
+	aclocal.m4 README Makefile Makefile.config install-sh \
 	mk/bootstrap.mk \
 	mk/boilerplate.mk mk/config.h.in mk/config.mk.in mk/opts.mk \
 	mk/paths.mk mk/package.mk mk/suffix.mk mk/target.mk