diff options
| author | Ian Lynagh <igloo@earth.li> | 2007-06-05 13:39:56 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2007-06-05 13:39:56 +0000 |
| commit | 094f9feafaf83190891736ddd8d1d7213f4293c4 (patch) | |
| tree | eef84f7271f9122703bda3f463f813708b75ac5f /distrib | |
| parent | db39fbf447d14801fe8ee4555bf51990944865c4 (diff) | |
| download | haskell-094f9feafaf83190891736ddd8d1d7213f4293c4.tar.gz | |
Install the RTS from a bindist correctly
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/Makefile | 29 | ||||
| -rw-r--r-- | distrib/Makefile-bin-vars.in | 5 | ||||
| -rw-r--r-- | distrib/configure-bin.ac | 5 |
3 files changed, 20 insertions, 19 deletions
diff --git a/distrib/Makefile b/distrib/Makefile index 2b6cdca0c1..d60e1117f6 100644 --- a/distrib/Makefile +++ b/distrib/Makefile @@ -12,14 +12,22 @@ in-place :: fi @echo "Finished configuring..to use, add `pwd`/bin/$(platform) to your PATH." -install-dirs :: +install :: $(INSTALL_DIR) $(bindir) (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 :: install-dirs install-driver install-utils install-libs install-datas install-docs postinstall denounce +install:: + $(MAKE) -C includes install DOING_BIN_DIST=YES + $(MAKE) -C driver install DOING_BIN_DIST=YES + $(MAKE) -C utils install DOING_BIN_DIST=YES + $(MAKE) -C rts install DOING_BIN_DIST=YES + $(MAKE) -C libraries install DOING_BIN_DIST=YES + $(MAKE) -C compiler install DOING_BIN_DIST=YES + +install :: install-docs postinstall denounce -.PHONY: install-libs install-utils install-datas postinstall denounce +.PHONY: postinstall denounce denounce: @echo @@ -44,21 +52,6 @@ postinstall: echo "Done" ; \ fi -install-libs: - (cd lib/$(platform); find . -type f -exec sh -c '$(CP) $$0 $(libdir)/$$0' {} \; ) - $(MAKE) -C libraries install DOING_BIN_DIST=YES - -install-driver: - $(MAKE) -C driver install DOING_BIN_DIST=YES - -install-utils: - $(MAKE) -C utils install DOING_BIN_DIST=YES - -install-datas: - set -e; for i in `(cd share; find . -type f )`; do \ - $(INSTALL_DATA) share/$$i $(datadir)/$$i; \ - done - show-install-setup: @echo "Install setup..." @echo "bindir = $(bindir)" diff --git a/distrib/Makefile-bin-vars.in b/distrib/Makefile-bin-vars.in index 0a4fdb98d1..5a54cbfbb6 100644 --- a/distrib/Makefile-bin-vars.in +++ b/distrib/Makefile-bin-vars.in @@ -27,8 +27,11 @@ LN_S = @LN_S@ CHMOD = chmod INSTALL = @INSTALL@ exeext = @exeext@ -SED = @SedCmd@ +SED = @SedCmd@ DEFAULT_TMPDIR = /tmp +RANLIB = @RANLIB@ + +RAWCPP_FLAGS = -undef -traditional #----------end of user-serviceable parts------------ # diff --git a/distrib/configure-bin.ac b/distrib/configure-bin.ac index fd8c2f15d9..0d01388e80 100644 --- a/distrib/configure-bin.ac +++ b/distrib/configure-bin.ac @@ -132,6 +132,11 @@ dnl ** how to do symlinks ** AC_PROG_LN_S() # +dnl ** how to invoke `ar' and `ranlib' +# +FP_PROG_AR_NEEDS_RANLIB + +# dnl ** Find the path to sed ** # AC_PATH_PROG(SedCmd,sed) |