[[project @ 1999-10-05 10:30:26 by simonmar]
simonmar**19991005103035
 Build System Cleanup
 --------------------
 
 This commit is intended to clear the way for automatic RPM building.
 In particular, the idea is that 'make install' doesn't build anything,
 so you can do
 
 	make install prefix=/some/tmp/prefix
 
 to install everything in /some/tmp/prefix, but leave the hardwired-in
 install directories the same.
 
 For scripts that depend on the install dir (currently just the GHC
 driver and mkdependHS), we now build two versions: <script>-inplace,
 which is used for running the script from the build tree, and
 <script>, which is the to-be-installed version.
 
 NOTE: binary distributions are now a little bit trickier to build.
 You *must* include the line "BIN_DIST=1" in your build.mk if you
 intend to make a binary distribution from the current build tree.
 This is because certain scripts have to be built differently, and we
 don't rebuild them when doing 'make binary-dist' anymore (since 'make
 binary-dist' just does a 'make install' with a re-targetted prefix,
 just like the RPM builder).
 
 Other changes
 
 	- the binary-dist machinery is now all in fptools/Makefile
 	- removed a gratuitous $(package)-$(version) level of
 	  directories from the binary distribution.
 	- binary distributions are now placed under the package
 	  name, rather than fptools/fptools.
 	- various other minor cleanups.
] {
hunk ./Makefile 27
-SRC_DIST_DIRS += mk docs CONTRIB distrib $(ProjectsToBuild)
+SRC_DIST_DIRS += mk docs distrib $(ProjectsToBuild)
hunk ./Makefile 30
-#
+# -----------------------------------------------------------------------------
hunk ./Makefile 36
-BIN_DIST_TMPDIR=$(shell pwd)
-BIN_DIST_NAME=fptools
+BIN_DIST_TMPDIR=$(FPTOOLS_TOP_ABS)
+BIN_DIST_NAME=$(ProjectNameShort)-$(ProjectVersion)
hunk ./Makefile 61
+#
+# binary-dist creates a binary bundle, set BIN_DIST_NAME
+# to package name and do `make binary-dist Project=<project-name>'
+# (normally this just a thing you would do from the toplevel of fptools)
+#
+.PHONY: binary-dist-pre binary-dist binary-pack
+
+BIN_DIST_NAME=$(ProjectNameShort)-$(ProjectVersion)
+BIN_DIST_TMPDIR=$(FPTOOLS_TOP_ABS)
+
+binary-dist-pre::
+	-rm -rf $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)
+	-rm -f $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME).tar.gz
+	@for i in $(BIN_DIST_DIRS); do 		 	 \
+	  if test -d "$$i"; then 			 \
+	   echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM); \
+	   $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM); \
+	   echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM); \
+	   $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM); \
+	   echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share; \
+	   $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share; \
+	   echo $(MAKE) -C $$i $(MFLAGS) install \
+		prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
+		exec_prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
+		bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM) \
+		libdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \
+		libexecdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \
+		datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share; \
+	   $(MAKE) -C $$i $(MFLAGS) install \
+		prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
+		exec_prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
+		bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM) \
+		libdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \
+		libexecdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \
+		datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share; \
+	  fi; \
+	done
+
hunk ./Makefile 146
-	    $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion)/$$i  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion)/$$i.prl; \
+	    $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i.prl; \
hunk ./Makefile 154
-	    $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion)/$$i  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion)/$$i.prl; \
+	    $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$$i  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$$i.prl; \
hunk ./Makefile 162
-	    $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion)/$$i  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion)/$$i.sh; \
+	    $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i.sh; \
hunk ./Makefile 166
+#
+# Do this separately for now
+# 
+binary-pack::
+	( cd $(BIN_DIST_TMPDIR); $(TAR) chzf $(BIN_DIST_NAME).tar.gz $(BIN_DIST_NAME) )
+
+ifneq "$(way)" ""
+package-way-dist::
+	( cd $(BIN_DIST_TMPDIR); find $(BIN_DIST_NAME)/ \( -name "*$(_way).a" -o -name "*.$(way_)hi" \) -print | xargs tar cvf $(BIN_DIST_TMPDIR)/ghc-$(ProjectVersion)-$(way)-$(TARGETPLATFORM).tar )
+	gzip $(BIN_DIST_TMPDIR)/ghc-$(ProjectVersion)-$(way)-$(TARGETPLATFORM).tar
+endif
+
+ifneq "$(way)" ""
+remove-way-dist::
+	( cd $(BIN_DIST_TMPDIR); find $(BIN_DIST_NAME)/ \( -name "*$(_way).a" -o -name "*.$(way_)hi" \) -print -exec rm -f {} \; )
+endif
+
+binary-dist::
+	@echo "Mechanical and super-natty! Inspect the result and *if* happy; freeze, sell and get some sleep!"
+
+# -----------------------------------------------------------------------------
+
hunk ./Makefile 192
-binary-dist::
-	@echo "Mechanical and super-natty! Inspect the result and *if* happy; freeze, sell and get some sleep!"
hunk ./distrib/Makefile-bin.in 61
-libdir      = @libdir@
-datadir     = @datadir@
+libdir      = @libdir@/$(package)-$(version)
+datadir     = @datadir@/$(package)-$(version)
hunk ./distrib/Makefile-bin.in 69
-infodir   = $(real_datadir)
-htmldir   = $(real_datadir)
-dvidir    = $(real_datadir)
+infodir   = $(datadir)
+htmldir   = $(datadir)
+dvidir    = $(datadir)
hunk ./distrib/Makefile-bin.in 73
-#
-# Putting the package stuff in package-specific
-# directories:
-#
-real_libdir      = $(libdir)/$(package)-$(version)
-real_datadir     = $(datadir)/$(package)-$(version)
hunk ./distrib/Makefile-bin.in 125
-	   $(RM) bin/$(platform)/$(package)-$(version)/$$i.bak; \
-	   if [ -f bin/$(platform)/$(package)-$(version)/$$i ]; then $(MV) bin/$(platform)/$(package)-$(version)/$$i bin/$(platform)/$(package)-$(version)/$$i.bak; fi; \
-	   echo "#! $(PERL)"  		        		> bin/$(platform)/$(package)-$(version)/$$i ; \
-	   echo '$$'"bindir='$(bindir)';"                        >> bin/$(platform)/$(package)-$(version)/$$i ; \
-	   echo '$$'"libdir='$(real_libdir)';"                   >> bin/$(platform)/$(package)-$(version)/$$i ; \
-	   echo '$$'"libexecdir='$(real_libdir)';"               >> bin/$(platform)/$(package)-$(version)/$$i ; \
-	   echo '$$'"datadir='$(real_datadir)';"                 >> bin/$(platform)/$(package)-$(version)/$$i ; \
-	   echo '$$'"SED='$(SED)';"		>> bin/$(platform)/$(package)-$(version)/$$i ; \
-	   echo '$$'"TMPDIR='$(TMPDIR)';"		>> bin/$(platform)/$(package)-$(version)/$$i ; \
-	   cat bin/$(platform)/$(package)-$(version)/$$i.prl   >> bin/$(platform)/$(package)-$(version)/$$i ; \
-	   $(CHMOD) $(BIN_PERMS) bin/$(platform)/$(package)-$(version)/$$i; \
+	   $(RM) bin/$(platform)/$$i.bak; \
+	   if [ -f bin/$(platform)/$$i ]; then $(MV) bin/$(platform)/$$i bin/$(platform)/$$i.bak; fi; \
+	   echo "#! $(PERL)"  		            >  bin/$(platform)/$$i ; \
+	   echo '$$'"bindir='$(bindir)';"           >> bin/$(platform)/$$i ; \
+	   echo '$$'"libdir='$(libdir)';"      	    >> bin/$(platform)/$$i ; \
+	   echo '$$'"libexecdir='$(libdir)';"       >> bin/$(platform)/$$i ; \
+	   echo '$$'"datadir='$(datadir)';"         >> bin/$(platform)/$$i ; \
+	   echo '$$'"SED='$(SED)';"		    >> bin/$(platform)/$$i ; \
+	   echo '$$'"TMPDIR='$(TMPDIR)';"	    >> bin/$(platform)/$$i ; \
+	   cat bin/$(platform)/$$i.prl   	    >> bin/$(platform)/$$i ; \
+	   $(CHMOD) $(BIN_PERMS) bin/$(platform)/$$i; \
hunk ./distrib/Makefile-bin.in 142
-	   $(RM) lib/$(platform)/$(package)-$(version)/$$i.bak; \
-	   if [ -f lib/$(platform)/$(package)-$(version)/$$i ]; then $(MV) lib/$(platform)/$(package)-$(version)/$$i lib/$(platform)/$(package)-$(version)/$$i.bak; fi; \
-	   echo "#! $(PERL)"                      > lib/$(platform)/$(package)-$(version)/$$i ; \
-	   echo '$$'"bindir='$(bindir)';"          >> lib/$(platform)/$(package)-$(version)/$$i ; \
-	   echo '$$'"libdir='$(real_libdir)';"     >> lib/$(platform)/$(package)-$(version)/$$i ; \
-	   echo '$$'"libexecdir='$(real_libdir)';" >> lib/$(platform)/$(package)-$(version)/$$i ; \
-	   echo '$$'"datadir='$(real_datadir)';"   >> lib/$(platform)/$(package)-$(version)/$$i ; \
-	   echo '$$'"SED='$(SED)';"		 >> lib/$(platform)/$(package)-$(version)/$$i ; \
-	   echo '$$'"TMPDIR='$(TMPDIR)';"		 >> lib/$(platform)/$(package)-$(version)/$$i ; \
-	   cat lib/$(platform)/$(package)-$(version)/$$i.prl >> lib/$(platform)/$(package)-$(version)/$$i; \
-	   $(CHMOD) $(BIN_PERMS) lib/$(platform)/$(package)-$(version)/$$i; \
+	   $(RM) lib/$(platform)/$$i.bak; \
+	   if [ -f lib/$(platform)/$$i ]; then $(MV) lib/$(platform)/$$i lib/$(platform)/$$i.bak; fi; \
+	   echo "#! $(PERL)"                       >  lib/$(platform)/$$i ; \
+	   echo '$$'"bindir='$(bindir)';"          >> lib/$(platform)/$$i ; \
+	   echo '$$'"libdir='$(libdir)';"          >> lib/$(platform)/$$i ; \
+	   echo '$$'"libexecdir='$(libdir)';"      >> lib/$(platform)/$$i ; \
+	   echo '$$'"datadir='$(datadir)';"        >> lib/$(platform)/$$i ; \
+	   echo '$$'"SED='$(SED)';"		   >> lib/$(platform)/$$i ; \
+	   echo '$$'"TMPDIR='$(TMPDIR)';"	   >> lib/$(platform)/$$i ; \
+	   cat lib/$(platform)/$$i.prl >> lib/$(platform)/$$i; \
+	   $(CHMOD) $(BIN_PERMS) lib/$(platform)/$$i; \
hunk ./distrib/Makefile-bin.in 159
-	   $(RM) bin/$(platform)/$(package)-$(version)/$$i.bak; \
-	   if [ -f bin/$(platform)/$(package)-$(version)/$$i ]; then $(MV) bin/$(platform)/$(package)-$(version)/$$i bin/$(platform)/$(package)-$(version)/$$i.bak; fi; \
-	   echo "#! $(SH)"                      > bin/$(platform)/$(package)-$(version)/$$i ; \
-	   echo "bindir='$(bindir)'"          >> bin/$(platform)/$(package)-$(version)/$$i ; \
-	   echo "libdir='$(real_libdir)'"     >> bin/$(platform)/$(package)-$(version)/$$i ; \
-	   echo "libexecdir='$(real_libdir)'" >> bin/$(platform)/$(package)-$(version)/$$i ; \
-	   echo "datadir='$(real_datadir)'"   >> bin/$(platform)/$(package)-$(version)/$$i ; \
-	   echo "SED='$(SED)'"			 >> bin/$(platform)/$(package)-$(version)/$$i ; \
-	   echo "TMPDIR='$(TMPDIR)'"		 >> bin/$(platform)/$(package)-$(version)/$$i ; \
-	   cat bin/$(platform)/$(package)-$(version)/$$i.sh >> bin/$(platform)/$(package)-$(version)/$$i; \
-	   $(CHMOD) $(BIN_PERMS) bin/$(platform)/$(package)-$(version)/$$i; \
+	   $(RM) bin/$(platform)/$$i.bak; \
+	   if [ -f bin/$(platform)/$$i ]; then $(MV) bin/$(platform)/$$i bin/$(platform)/$$i.bak; fi; \
+	   echo "#! $(SH)"                      >  bin/$(platform)/$$i ; \
+	   echo "bindir='$(bindir)'"            >> bin/$(platform)/$$i ; \
+	   echo "libdir='$(libdir)'"            >> bin/$(platform)/$$i ; \
+	   echo "libexecdir='$(libdir)'"        >> bin/$(platform)/$$i ; \
+	   echo "datadir='$(datadir)'"          >> bin/$(platform)/$$i ; \
+	   echo "SED='$(SED)'"			>> bin/$(platform)/$$i ; \
+	   echo "TMPDIR='$(TMPDIR)'"		>> bin/$(platform)/$$i ; \
+	   cat bin/$(platform)/$$i.sh >> bin/$(platform)/$$i; \
+	   $(CHMOD) $(BIN_PERMS) bin/$(platform)/$$i; \
hunk ./distrib/Makefile-bin.in 179
-	$(MAKE) $(MFLAGS) config-pkgs bindir=$(CURRENT_DIR)/bin/$(platform)/$(package)-$(version) libdir=$(CURRENT_DIR)/lib/$(platform) datadir=$(CURRENT_DIR)/share/$(package)-$(version)
-	@echo "Finished configuring..to use, add $(CURRENT_DIR)/bin/$(platform)/$(package)-$(version) to your PATH."
+	$(MAKE) $(MFLAGS) config-pkgs bindir=$(CURRENT_DIR)/bin/$(platform) libdir=$(CURRENT_DIR)/lib/$(platform) datadir=$(CURRENT_DIR)/share
+	@echo "Finished configuring..to use, add $(CURRENT_DIR)/bin/$(platform) to your PATH."
hunk ./distrib/Makefile-bin.in 184
-	(cd lib/$(platform)/$(package)-$(version); find . -type d -exec sh -c '../../../$(INSTALL_DIR) $$0 $(real_libdir)/$$0' {} \; )
-	(cd share/$(package)-$(version); find . -type d -exec sh -c '../../$(INSTALL_DIR) $(real_datadir)/$$0' {} \; )
+	(cd lib/$(platform); find . -type d -exec sh -c '../../$(INSTALL_DIR) $$0 $(libdir)/$$0' {} \; )
+	(cd share; find . -type d -exec sh -c '../$(INSTALL_DIR) $(datadir)/$$0' {} \; )
hunk ./distrib/Makefile-bin.in 193
-	   if test -n "$$i" ; then $(INSTALL_BIN) bin/$(platform)/$(package)-$(version)/$$i $(bindir); fi; \
+	   if test -n "$$i" ; then $(INSTALL_BIN) bin/$(platform)/$$i $(bindir); fi; \
hunk ./distrib/Makefile-bin.in 196
-	   if test -n "$$i" ; then $(INSTALL_BIN) bin/$(platform)/$(package)-$(version)/$$i$(exeext) $(bindir); fi; \
+	   if test -n "$$i" ; then $(INSTALL_BIN) bin/$(platform)/$$i$(exeext) $(bindir); fi; \
hunk ./distrib/Makefile-bin.in 216
-	(cd lib/$(platform)/$(package)-$(version); find . -type f -exec sh -c '$(CP) $$0 $(real_libdir)/$$0' {} \; )
+	(cd lib/$(platform); find . -type f -exec sh -c '$(CP) $$0 $(libdir)/$$0' {} \; )
hunk ./distrib/Makefile-bin.in 219
-	(cd share/$(package)-$(version); find . -type f -exec sh -c '$(INSTALL_DATA) $$0 $(real_datadir)/$$0' {} \; )
+	(cd share; find . -type f -exec sh -c '$(INSTALL_DATA) $$0 $(datadir)/$$0' {} \; )
hunk ./distrib/Makefile-bin.in 224
-	@echo "libdir  = $(libdir) (real_libdir  = $(real_libdir))"
-	@echo "datadir = $(datadir) (real_datadir = $(real_datadir))"
+	@echo "libdir  = $(libdir) (libdir  = $(libdir))"
+	@echo "datadir = $(datadir) (datadir = $(datadir))"
hunk ./distrib/Makefile-bin.in 237
-	$(INSTALL_DATA) dvi/$(package)-$(version)/* $(dvidir)
+	$(INSTALL_DATA) dvi/* $(dvidir)
hunk ./distrib/Makefile-bin.in 240
-	$(INSTALL_DATA) info/$(package)-$(version)/* $(infodir)
+	$(INSTALL_DATA) info/* $(infodir)
hunk ./distrib/Makefile-bin.in 243
-	$(INSTALL_DATA) html/$(package)-$(version)/* $(htmldir)
+	$(INSTALL_DATA) html/* $(htmldir)
hunk ./ghc/driver/Makefile 2
+# $Id: Makefile,v 1.24 1999/10/05 10:30:35 simonmar Exp $
+
+# We create two driver scripts: 
+#	- one to run in-place in the build tree for building libraries
+#	- one wired to the install locations for later installation
hunk ./ghc/driver/Makefile 8
+# the installation script is built first, and we invoke make recursively
+# to build the in-place version.
hunk ./ghc/driver/Makefile 14
-#
-# The driver needs to get at the version
-include $(TOP)/mk/version.mk
hunk ./ghc/driver/Makefile 15
-INSTALLING=0
+INSTALLING=1
hunk ./ghc/driver/Makefile 23
-SCRIPT_PROG = ghc-$(ProjectVersion)
-SCRIPT_LINK = ghc
+INSTALLED_SCRIPT_PROG  = ghc-$(ProjectVersion)
+INPLACE_SCRIPT_PROG    = ghc-inplace
+
+ifeq "$(INSTALLING)" "1"
+TOP_PWD 	:= $(prefix)
+SCRIPT_PROG 	=  $(INSTALLED_SCRIPT_PROG)
+SCRIPT_LINK 	=  ghc
+else
+TOP_PWD 	:= $(FPTOOLS_TOP_ABS)
+SCRIPT_PROG 	=  $(INPLACE_SCRIPT_PROG)
+endif
+
hunk ./ghc/driver/Makefile 48
-ifeq "$(INSTALLING)" "1"
-TOP_PWD := $(prefix)
-else
-TOP_PWD := $(FPTOOLS_TOP_ABS)
-endif
-
hunk ./ghc/driver/Makefile 50
-  ProjectName ProjectVersion ProjectVersionInt ProjectPatchLevel \
+  ProjectName ProjectVersion ProjectVersionInt \
hunk ./ghc/driver/Makefile 53
-  GHC_LIB_DIR GHC_RUNTIME_DIR GHC_UTILS_DIR GHC_INCLUDE_DIR \
+  GHC_LIB_DIR GHC_RUNTIME_DIR GHC_INCLUDE_DIR \
hunk ./ghc/driver/Makefile 55
-  GHC_UNLIT GHC_HSCPP GHC_HSC GHC_SYSMAN EnableWin32DLLs \
+  GHC_UNLIT GHC_HSCPP GHC_MKDEPENDHS GHC_HSC GHC_SYSMAN EnableWin32DLLs \
hunk ./ghc/driver/Makefile 73
+# don't recurse on 'make install'
+#
+ifeq "$(INSTALLING)" "1"
+all clean veryclean maintainer-clean ::
+	$(MAKE) INSTALLING=0 BIN_DIST=0 $(MFLAGS) $@
+endif
+
hunk ./ghc/driver/Makefile 90
-#
-# Before really installing the driver, we have to
-# reconfigure it such that the paths it refers to,
-# point to the installed utils.
-#
-install ::
-	@$(RM) $(SCRIPT_PROG)
-	@$(MAKE) $(MFLAGS) INSTALLING=1 $(SCRIPT_PROG)
-
hunk ./ghc/driver/Makefile 109
-# Hack to re-create the in-situ build tree driver script after 
-# having installed it.
-#
-install ::
-	@$(RM) $(SCRIPT_PROG)
-	@$(MAKE) $(MFLAGS) BIN_DIST=0 INSTALLING=0 $(SCRIPT_PROG)
-
hunk ./ghc/driver/ghc.lprl 101
-ProjectName ProjectVersion ProjectVersionInt ProjectPatchLevel 
+ProjectName ProjectVersion ProjectVersionInt
hunk ./ghc/driver/ghc.lprl 111
-GHC_LIB_DIR GHC_RUNTIME_DIR GHC_UTILS_DIR GHC_INCLUDE_DIR
+GHC_LIB_DIR GHC_RUNTIME_DIR GHC_INCLUDE_DIR
hunk ./ghc/driver/ghc.lprl 115
-GHC_UNLIT GHC_HSCPP GHC_HSC GHC_SYSMAN
+GHC_UNLIT GHC_HSCPP GHC_MKDEPENDHS GHC_HSC GHC_SYSMAN
hunk ./ghc/driver/ghc.lprl 388
-$TopClosureFile # defaults to 1.2 one; will be mangled later
-	= '';
-#	( $INSTALLING)  ? "$InstLibDirGhc/TopClosureXXXX.o"
-#			  : "$TopPwd/$CURRENT_DIR/$GHC_RUNTIME_DIR/main/TopClosureXXXX.o";
-
hunk ./ghc/driver/ghc.lprl 391
-			  : "$TopPwd/$CURRENT_DIR/$GHC_UTILS_DIR/mkdependHS/mkdependHS";
+			  : "$TopPwd/$CURRENT_DIR/$GHC_MKDEPENDHS";
hunk ./ghc/driver/ghc.lprl 1226
-print STDERR "${ProjectName}, version ${ProjectVersion}, patchlevel ${ProjectPatchLevel}\n"
-    if $Verbose;
+print STDERR "${ProjectName}, version ${ProjectVersion}\n" if $Verbose;
hunk ./ghc/driver/ghc.lprl 1846
-    local($to_do) = "$lnkr $Verbose @Ld_flags $output @Link_file $TopClosureFile $libdirs @UserLibrary @SysLibrary";
+    local($to_do) = "$lnkr $Verbose @Ld_flags $output @Link_file $libdirs @UserLibrary @SysLibrary";
hunk ./ghc/driver/ghc.lprl 1891
-# Generated by Glasgow Haskell, version ${ProjectVersion} ${ProjectPatchLevel}
+# Generated by Glasgow Haskell, version ${ProjectVersion}
hunk ./ghc/driver/ghc.lprl 2772
-    /^--version$/   && do { print STDERR "${ProjectName}, version ${ProjectVersion}, patchlevel ${ProjectPatchLevel}\n"; exit $Status; };
+    /^--version$/   && do { print STDERR "${ProjectName}, version ${ProjectVersion}\n"; exit $Status; };
hunk ./ghc/lib/concurrent/Makefile 1
-# $Id: Makefile,v 1.7 1999/09/17 10:43:51 sof Exp $
+# $Id: Makefile,v 1.8 1999/10/05 10:30:27 simonmar Exp $
hunk ./ghc/lib/concurrent/Makefile 11
+HC = $(GHC)
+
hunk ./ghc/lib/exts/Makefile 14
+
+HC = $(GHC)
hunk ./ghc/lib/misc/Makefile 1
-# $Id: Makefile,v 1.18 1999/09/17 10:43:52 sof Exp $
+# $Id: Makefile,v 1.19 1999/10/05 10:30:28 simonmar Exp $
hunk ./ghc/lib/misc/Makefile 17
+HC = $(GHC)
+
hunk ./ghc/lib/posix/Makefile 2
-# $Id: Makefile,v 1.7 1999/05/11 17:05:48 keithw Exp $
+# $Id: Makefile,v 1.8 1999/10/05 10:30:29 simonmar Exp $
hunk ./ghc/lib/posix/Makefile 18
+HC = $(GHC)
+
hunk ./ghc/lib/std/Makefile 20
+
+HC = $(GHC)
hunk ./ghc/mk/paths.mk 45
-GHC 			= $(GHC_DRIVER_DIR)/ghc
+GHC 			= $(GHC_DRIVER_DIR)/ghc-inplace
hunk ./ghc/mk/paths.mk 48
+GHC_MKDEPENDHS_DIR	= $(GHC_UTILS_DIR)/mkdependHS
+GHC_MKDEPENDHS 		= $(GHC_MKDEPENDHS_DIR)/mkdependHS-inplace
hunk ./ghc/mk/version.mk 19
-# *ProjectVersion    is treated as a *string*
-# *ProjectVersionInt is treated as an *integer* (for cpp defines)
+# ProjectVersion    is treated as a *string*
+# ProjectVersionInt is treated as an *integer* (for cpp defines)
+
+# Versioning scheme: A.BB.C
+#         A: major version, any number of digits
+#         B: minor version, two digits padded with leading zeros
+#	  C: patchlevel, one digit, omitted if zero.
+#
+# ProjectVersionInt does *not* contain the patchlevel (rationale: this
+# figure is used for conditional compilations, and library interfaces
+# etc. are not supposed to change between patchlevels).
hunk ./ghc/mk/version.mk 35
-ProjectPatchLevel = 0
hunk ./ghc/utils/hscpp/Makefile 1
+#-----------------------------------------------------------------------------
+# $Id: Makefile,v 1.11 1999/10/05 10:30:33 simonmar Exp $
+#
+# hscpp doesn't depend on any of the install paths, so we don't need to
+# play the same tricks we play with mkdependHS and the GHC driver script.
+
hunk ./ghc/utils/hscpp/Makefile 14
-# Note: might be overridden from cmd-line (see install rule below)
-INSTALLING=0
-
hunk ./ghc/utils/hscpp/Makefile 22
-
-#
-# Before really installing the script, we have to
-# reconfigure it such that the paths it refers to,
-# point to the installed utils.
-#
-install ::
-	@$(RM) $(SCRIPT_PROG)
-	@$(MAKE) $(MFLAGS) INSTALLING=1 $(SCRIPT_PROG)
-
-
hunk ./ghc/utils/hscpp/Makefile 24
-
-# Hack to re-create the in-situ build tree script after 
-# having just installed it.
-#
-install ::
-	@$(RM) $(SCRIPT_PROG)
-	@$(MAKE) $(MFLAGS) BIN_DIST=0 $(SCRIPT_PROG)
-
-
hunk ./ghc/utils/mkdependHS/Makefile 1
+#-----------------------------------------------------------------------------
+# $Id: Makefile,v 1.18 1999/10/05 10:30:33 simonmar Exp $
+
hunk ./ghc/utils/mkdependHS/Makefile 6
-include $(TOP)/mk/version.mk
-INSTALLING=0
+
+INSTALLING=1
hunk ./ghc/utils/mkdependHS/Makefile 11
-SCRIPT_PROG=mkdependHS
-SCRIPT_OBJS=mkdependHS.prl
hunk ./ghc/utils/mkdependHS/Makefile 19
-#
-# install setup
-#
-INSTALL_LIB_SCRIPTS += $(SCRIPT_PROG)
+INSTALLED_SCRIPT_PROG  = mkdependHS
+INPLACE_SCRIPT_PROG    = mkdependHS-inplace
hunk ./ghc/utils/mkdependHS/Makefile 22
-ifneq "$(BIN_DIST)" "1"
-SCRIPT_SUBST_VARS += libdir datadir TMPDIR SED
+ifeq "$(INSTALLING)" "1"
+TOP_PWD 	:= $(prefix)
+SCRIPT_PROG 	=  $(INSTALLED_SCRIPT_PROG)
+SCRIPT_LINK 	=  ghc
+else
+TOP_PWD 	:= $(FPTOOLS_TOP_ABS)
+SCRIPT_PROG 	=  $(INPLACE_SCRIPT_PROG)
hunk ./ghc/utils/mkdependHS/Makefile 31
+SCRIPT_OBJS=mkdependHS.prl
hunk ./ghc/utils/mkdependHS/Makefile 33
-#
-# Prepend an infomercial if installing (binary-dist or the real thing).
-#
-ifeq "$(INSTALLING)" "1"
hunk ./ghc/utils/mkdependHS/Makefile 35
-endif
+else
+SCRIPT_SUBST_VARS += libdir datadir TMPDIR SED
hunk ./ghc/utils/mkdependHS/Makefile 39
+# don't recurse on 'make install'
+#
hunk ./ghc/utils/mkdependHS/Makefile 42
-TOP_PWD:=$(prefix)
-else
-TOP_PWD:=$(FPTOOLS_TOP_ABS)
+all clean veryclean maintainer-clean ::
+	$(MAKE) INSTALLING=0 BIN_DIST=0 $(MFLAGS) $@
hunk ./ghc/utils/mkdependHS/Makefile 47
-# Before really installing the script, we have to
-# reconfigure it such that the paths it refers to,
-# point to the installed utils.
+# install setup
hunk ./ghc/utils/mkdependHS/Makefile 49
-install ::
-	$(RM) $(SCRIPT_PROG)
-	$(MAKE) $(MFLAGS) INSTALLING=1 $(SCRIPT_PROG)
+INSTALL_LIB_SCRIPTS += $(SCRIPT_PROG)
hunk ./ghc/utils/mkdependHS/Makefile 53
-#
-# Hack to re-create the in-situ build tree script after 
-# having just installed it (if you don't, confusion ensues
-# if you try to use the build tree copy afterwards..)
-#
-install ::
-	@$(RM) $(SCRIPT_PROG)
-	@$(MAKE) $(MFLAGS) BIN_DIST=0 INSTALLING=0 $(SCRIPT_PROG)
-
hunk ./mk/target.mk 726
-
-#
-# binary-dist creates a binary bundle, set BIN_DIST_NAME
-# to package name and do `make binary-dist' (normally this
-# just a thing you would do from the toplevel of fptools or)
-# from the top of a project.
-#
-.PHONY: binary-dist-pre binary-dist binary-pack
-
-binary-dist-pre::
-	-rm -rf $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)
-	-rm -f $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME).tar.gz
-	@for i in $(BIN_DIST_DIRS); do 		 	 \
-	  if test -d "$$i"; then 			 \
-	   echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion); \
-	   $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion); \
-	   echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion); \
-	   $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion); \
-	   echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share/$(ProjectNameShort)-$(ProjectVersion); \
-	   $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share/$(ProjectNameShort)-$(ProjectVersion); \
-	   echo $(MAKE) -C $$i $(MFLAGS) install BIN_DIST=1 BIN_DIST_NAME=$(BIN_DIST_NAME) \
-			prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
-			exec_prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
-			bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion) \
-			libdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion) \
-			libexecdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion) \
-			datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share/$(ProjectNameShort)-$(ProjectVersion) ; \
-	   $(MAKE) -C $$i $(MFLAGS) install BIN_DIST=1 BIN_DIST_NAME=$(BIN_DIST_NAME) \
-			prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
-			exec_prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
-			bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion) \
-			libdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion) \
-			libexecdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion) \
-			datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share/$(ProjectNameShort)-$(ProjectVersion) ; \
-	  fi; \
-	done
-
-#
-# Do this separately for now
-# 
-binary-pack::
-	( cd $(BIN_DIST_TMPDIR); $(TAR) chzf $(BIN_DIST_NAME).tar.gz $(BIN_DIST_NAME); rm -rf $(BIN_DIST_NAME) )
-
-ifneq "$(way)" ""
-package-way-dist::
-	( cd $(BIN_DIST_TMPDIR); find $(BIN_DIST_NAME)/ \( -name "*$(_way).a" -o -name "*.$(way_)hi" \) -print | xargs tar cvf $(BIN_DIST_TMPDIR)/ghc-$(ProjectVersion)-$(way)-$(TARGETPLATFORM).tar )
-	gzip $(BIN_DIST_TMPDIR)/ghc-$(ProjectVersion)-$(way)-$(TARGETPLATFORM).tar
-endif
-
-ifneq "$(way)" ""
-remove-way-dist::
-	( cd $(BIN_DIST_TMPDIR); find $(BIN_DIST_NAME)/ \( -name "*$(_way).a" -o -name "*.$(way_)hi" \) -print -exec rm -f {} \; )
-endif
}