X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=44ac9acd6b013c8b37b738c87cdaa30ba5f0b5bc;hb=fdbc4fd7803f523c17f186612d7912bac9a2d8f6;hp=496fefd2dae20af4455af5fb71f58956823ed9cc;hpb=75e543086017960141dac57c57be5e8dcff03a07;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index 496fefd..44ac9ac 100644
--- a/Makefile
+++ b/Makefile
@@ -167,7 +167,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 \
@@ -239,7 +239,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,7 +349,7 @@ SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME)
 #
 SRC_DIST_DIRS += docs distrib $(SUBDIRS)
 SRC_DIST_FILES += \
-	configure.in config.guess config.sub configure \
+	configure.ac config.guess config.sub configure \
 	aclocal.m4 acconfig.h README Makefile Makefile.config install-sh \
 	mk/bootstrap.mk \
 	mk/boilerplate.mk mk/config.h.in mk/config.mk.in mk/opts.mk \
@@ -391,13 +391,15 @@ hc-file-bundle : project-check
 	$(RM) -r $(ProjectNameShort)-$(ProjectVersion)
 	$(LN_S) . $(ProjectNameShort)-$(ProjectVersion)
 	$(FIND) $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler \
+	     $(ProjectNameShort)-$(ProjectVersion)/ghc/utils \
 	     $(ProjectNameShort)-$(ProjectVersion)/libraries -follow \
 	  \( -name "*.hc" -o -name "*_hsc.[ch]" -o -name "*_stub.[ch]" \) -print > hc-files-to-go
-	for f in `$(FIND) $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler $(ProjectNameShort)-$(ProjectVersion)/libraries -name "*.hsc" -print` ""; do \
+	for f in `$(FIND) $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler $(ProjectNameShort)-$(ProjectVersion)/ghc/utils $(ProjectNameShort)-$(ProjectVersion)/libraries -name "*.hsc" -follow -print` ""; do \
 	     if test "x$$f" != "x" && test -e `echo "$$f" | sed 's/hsc$$/hs/g'`; then \
 	        echo `echo "$$f" | sed 's/hsc$$/hs/g' ` >> hc-files-to-go ; \
 	     fi; \
 	done;
+	echo $(ProjectNameShort)-$(ProjectVersion)/ghc/rts/AutoApply.hc >> hc-files-to-go
 	echo $(ProjectNameShort)-$(ProjectVersion)/libraries/base/GHC/PrimopWrappers.hs >> hc-files-to-go
 	echo $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler/parser/Parser.hs >> hc-files-to-go
 	echo $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler/parser/ParserCore.hs >> hc-files-to-go