diff options
| author | Ian Lynagh <igloo@earth.li> | 2009-08-16 19:00:43 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2009-08-16 19:00:43 +0000 |
| commit | e0da731cc99c71a7c5c6abe20ede5145eda11475 (patch) | |
| tree | bea1a210c6c239da44329b6bdacddfa9c1552419 | |
| parent | 4eab948344ac91fab6a170f0ca6e34c37888fe14 (diff) | |
| download | haskell-e0da731cc99c71a7c5c6abe20ede5145eda11475.tar.gz | |
Build fixes
| -rw-r--r-- | driver/mangler/ghc.mk | 4 | ||||
| -rw-r--r-- | driver/split/ghc.mk | 4 | ||||
| -rw-r--r-- | ghc.mk | 9 |
3 files changed, 12 insertions, 5 deletions
diff --git a/driver/mangler/ghc.mk b/driver/mangler/ghc.mk index f07b609257..92b00c4370 100644 --- a/driver/mangler/ghc.mk +++ b/driver/mangler/ghc.mk @@ -12,8 +12,8 @@ driver/mangler_PERL_SRC = ghc-asm.lprl driver/mangler_dist_PROG = $(GHC_MANGLER_PGM) -driver/mangler_dist_LIBEXEC = YES +driver/mangler_dist_TOPDIR = YES $(eval $(call build-perl,driver/mangler,dist)) -INSTALL_LIBEXEC_SCRIPTS += driver/mangler/dist/$(GHC_MANGLER_PGM) +INSTALL_TOPDIR_SCRIPTS += driver/mangler/dist/$(GHC_MANGLER_PGM) diff --git a/driver/split/ghc.mk b/driver/split/ghc.mk index eeec8e7fb2..388e212b13 100644 --- a/driver/split/ghc.mk +++ b/driver/split/ghc.mk @@ -12,8 +12,8 @@ driver/split_PERL_SRC = ghc-split.lprl driver/split_dist_PROG = $(GHC_SPLIT_PGM) -driver/split_dist_LIBEXEC = YES +driver/split_dist_TOPDIR = YES $(eval $(call build-perl,driver/split,dist)) -INSTALL_LIBEXEC_SCRIPTS += driver/split/dist/$(GHC_SPLIT_PGM) +INSTALL_TOPDIR_SCRIPTS += driver/split/dist/$(GHC_SPLIT_PGM) @@ -697,7 +697,8 @@ libraries/ghc-prim/dist-install/build/autogen/GHC/PrimopWrappers.hs: \ # Installation install: install_packages install_libs install_libexecs install_headers \ - install_libexec_scripts install_bins install_docs install_topdirs + install_libexec_scripts install_bins install_docs \ + install_topdirs install_topdir_scripts install_bins: $(INSTALL_BINS) $(INSTALL_DIR) $(DESTDIR)$(bindir) @@ -739,6 +740,12 @@ install_libexecs: $(INSTALL_LIBEXECS) $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(DESTDIR)$(ghclibexecdir); \ done +install_topdir_scripts: $(INSTALL_TOPDIR_SCRIPTS) + $(INSTALL_DIR) $(DESTDIR)$(topdir) + for i in $(INSTALL_TOPDIR_SCRIPTS); do \ + $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(DESTDIR)$(topdir); \ + done + install_topdirs: $(INSTALL_TOPDIRS) $(INSTALL_DIR) $(DESTDIR)$(topdir) for i in $(INSTALL_TOPDIRS); do \ |