X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=distrib%2FMakefile-bin.in;h=61c0cf5e81aba9e6f95928fc8b03b76a3f0b8910;hb=4543231901d23f0d6e5d278ff9a2be3d648aa073;hp=b8507d98b0a3d839cd8635f18b2235f4a0a285f5;hpb=262acc0743a1f7afba001d92760d4916be5ac12e;p=ghc-hetmet.git diff --git a/distrib/Makefile-bin.in b/distrib/Makefile-bin.in index b8507d9..61c0cf5 100644 --- a/distrib/Makefile-bin.in +++ b/distrib/Makefile-bin.in @@ -22,7 +22,7 @@ # Note, if you specify /usr/foo/lib for libdir, # the library files for your fptools package will be # installed in /usr/foo/lib/-, e.g., -# /usr/foo/lib/ghc-2.07. If you don't want the package/version +# /usr/foo/lib/ghc-3.00. If you don't want the package/version # directory appended, you'll have to modify $(real_libdir) # below. # @@ -58,8 +58,8 @@ # Where the different pieces of the bundle should go: bindir = @bindir@ -libdir = @libdir@ -datadir = @datadir@ +libdir = @libdir@/$(package)-$(version) +datadir = @datadir@/$(package)-$(version) platform = @TargetPlatform@ prefix = @prefix@ @@ -70,12 +70,6 @@ infodir = $(datadir) htmldir = $(datadir) dvidir = $(datadir) -# -# Putting the package stuff in package-specific -# directories: -# -real_libdir = $(libdir)/$(package)-$(version) -real_datadir = $(datadir)/$(package)-$(version) PERL = @PerlCmd@ SH = /bin/sh @@ -85,8 +79,10 @@ CP = cp LN_S = @LN_S@ CHMOD = chmod INSTALL = @INSTALL@ -RAWCPP = @RAWCPP@ +exeext = @exeext@ SED = @SedCmd@ +TMPDIR = /tmp + # sigh INSTALL_DIR = ./mkdirhier @@ -98,7 +94,7 @@ INSTALL_DIR = ./mkdirhier VERSION_SYMLINKS_FOR=$(package) # Binaries to install -PACKAGE_BIN_INSTALL=$(PACKAGE_PRL_SCRIPTS) $(PACKAGE_SH_SCRIPTS) $(PACKAGE_BINS) +PACKAGE_BIN_INSTALL=$(PACKAGE_PRL_SCRIPTS) $(PACKAGE_SH_SCRIPTS) #----------end of user-serviceable parts------------ # @@ -123,101 +119,110 @@ INSTALL_DATA_OPTS = -m $(LIB_PERMS) $(INSTALL_OPTS) $(EXTRA_INSTALL_DATA_OPTS) config-pkgs :: @echo "Configuring $(package), version $(version), on $(platform) ..." - @for i in $(PACKAGE_PRL_SCRIPTS); do \ + @for i in $(PACKAGE_PRL_SCRIPTS) ""; do \ + if test "$$i"; then \ echo "Creating a configured version of $$i .."; \ - $(RM) bin/$(platform)/$(package)-$(version)/$$i.bak; \ - test -f bin/$(platform)/$(package)-$(version)/$$i && $(MV) bin/$(platform)/$(package)-$(version)/$$i bin/$(platform)/$(package)-$(version)/$$i.bak; \ - 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 '$$'"RAWCPP='$(RAWCPP)';" >> 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; \ echo "Done."; \ + fi; \ done - @for i in $(PACKAGE_LIB_PRL_SCRIPTS); do \ + @for i in $(PACKAGE_LIB_PRL_SCRIPTS) ""; do \ + if test "$$i"; then \ echo "Creating a configured version of $$i .."; \ - $(RM) lib/$(platform)/$(package)-$(version)/$$i.bak; \ - test -f lib/$(platform)/$(package)-$(version)/$$i && $(MV) lib/$(platform)/$(package)-$(version)/$$i lib/$(platform)/$(package)-$(version)/$$i.bak; \ - 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 '$$'"RAWCPP='$(RAWCPP)';" >> 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; \ echo "Done."; \ + fi; \ done - @for i in $(PACKAGE_SH_SCRIPTS); do \ + @for i in $(PACKAGE_SH_SCRIPTS) ""; do \ + if test "$$i"; then \ echo "Creating a configured version of $$i .."; \ - $(RM) bin/$(platform)/$(package)-$(version)/$$i.bak; \ - test -f bin/$(platform)/$(package)-$(version)/$$i && $(MV) bin/$(platform)/$(package)-$(version)/$$i bin/$(platform)/$(package)-$(version)/$$i.bak; \ - 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 "RAWCPP='$(RAWCPP)'" >> 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; \ echo "Done."; \ + fi; \ done - -mk-version-symlinks :: - @for i in $(VERSION_SYMLINKS_FOR) ""; do \ - if [ "x$$i" != "x" ]; then \ - echo "Symlinking $$i to $$i-$(version)"; \ - (cd bin/$(platform)/$(package)-$(version); $(RM) $$i-$(version); $(LN_S) $$i $$i-$(version) ); \ - fi;\ - done +# Convert pwd's UNC reported path into DOS style +# (cygwin32 only.) +CURRENT_DIR = $(shell pwd | sed 's|^//\(.\)|\1:|' ) in-place :: - $(MAKE) $(MFLAGS) config-pkgs bindir=`pwd`/bin/$(platform)/$(package)-$(version) libdir=`pwd`/lib/$(platform) datadir=`pwd`/share/$(package)-$(version) - $(MAKE) $(MFLAGS) mk-version-symlinks - @echo "Finished configuring..to use, add `pwd`/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." install-dirs :: $(INSTALL_DIR) $(bindir) - (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' {} \; ) -install :: config-pkgs mk-version-symlinks install-dirs install-bin install-libs install-datas +install :: config-pkgs install-dirs install-bin install-libs install-datas .PHONY: install-bin install-libs install-datas install-bin: - for i in $(PACKAGE_BIN_INSTALL); do \ - $(INSTALL_BIN) bin/$(platform)/$(package)-$(version)/$$i $(bindir); \ + for i in $(PACKAGE_BIN_INSTALL) ""; do \ + if test -n "$$i" ; then $(INSTALL_BIN) bin/$(platform)/$$i $(bindir); fi; \ + done; + for i in $(PACKAGE_BINS) ""; do \ + if test -n "$$i" ; then $(INSTALL_BIN) bin/$(platform)/$$i$(exeext) $(bindir); fi; \ done; for i in $(VERSION_SYMLINKS_FOR) ""; do \ if [ "x$$i" != "x" ]; then \ ( cd $(bindir); \ - $(RM) $$i-$(version); \ - $(MV) $$i $$i-$(version); \ - $(LN_S) $$i-$(version) $$i \ + if ( $(PERL) -e '$$fn="'$$i'"; exit ((! -f $$fn || -l $$fn) ? 0 : 1);' ); then \ + echo "Creating a symbol link from $$i-$(version) to $$i"; \ + $(RM) $$i; \ + $(LN_S) $$i-$(version) $$i; \ + else \ + echo "Creating a symbol link from $$i-$(version) to $$i failed: \`$$i' already exists"; \ + echo "Perhaps remove \`$$i' manually?"; \ + exit 1; \ + fi;\ ); \ fi; \ done install-libs: - (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' {} \; ) install-datas: - (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' {} \; ) show-install-setup: @echo "Install setup..." @echo "bindir = $(bindir)" - @echo "libdir = $(libdir) (real_libdir = $(real_libdir))" - @echo "datadir = $(datadir) (real_datadir = $(real_datadir))" + @echo "libdir = $(libdir) (libdir = $(libdir))" + @echo "datadir = $(datadir) (datadir = $(datadir))" # # Documentation targets, install-docs for the whole lot, or @@ -229,13 +234,13 @@ show-install-setup: install-docs : install-html install-dvi install-info install-dvi: install-dirs-dvi - $(INSTALL_DATA) dvi/$(package)-$(version)/* $(dvidir) + $(INSTALL_DATA) dvi/* $(dvidir) install-info: install-dirs-info - $(INSTALL_DATA) info/$(package)-$(version)/* $(infodir) + $(INSTALL_DATA) info/* $(infodir) install-html: install-dirs-html - $(INSTALL_DATA) html/$(package)-$(version)/* $(htmldir) + $(INSTALL_DATA) html/* $(htmldir) install-dirs-html: $(INSTALL_DIR) $(htmldir)