diff options
author | Ian Lynagh <igloo@earth.li> | 2010-03-24 17:14:22 +0000 |
---|---|---|
committer | Ian Lynagh <igloo@earth.li> | 2010-03-24 17:14:22 +0000 |
commit | 484511cebe6055c13bedf6b9c773f96ae9d63dc3 (patch) | |
tree | 0584b1bca69c8bd1beec557a8b217efecfcf9e04 /ghc.mk | |
parent | 4a0b6d6cba4c6d053c928ecc111ff0a300443f4b (diff) | |
download | haskell-484511cebe6055c13bedf6b9c773f96ae9d63dc3.tar.gz |
Change how perl scripts get installed; partially fixes #3863
We now regenerate them when installing, which means the path for perl
doesn't get baked in
Diffstat (limited to 'ghc.mk')
-rw-r--r-- | ghc.mk | 10 |
1 files changed, 2 insertions, 8 deletions
@@ -760,7 +760,7 @@ TAGS: TAGS_compiler install: install_packages install_libs install_libexecs install_headers \ install_libexec_scripts install_bins install_docs \ - install_topdirs install_topdir_scripts + install_topdirs install_bins: $(INSTALL_BINS) $(INSTALL_DIR) "$(DESTDIR)$(bindir)" @@ -809,12 +809,6 @@ else "$(MV)" "$(DESTDIR)$(ghclibexecdir)/ghc-stage2" "$(DESTDIR)$(ghclibexecdir)/ghc" endif -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 \ @@ -920,6 +914,7 @@ $(eval $(call bindist,.,\ $(INPLACE_BIN)/ghc-cabal \ utils/ghc-pwd/ghc-pwd \ $(BINDIST_WRAPPERS) \ + $(BINDIST_PERL_SOURCES) \ $(BINDIST_LIBS) \ $(BINDIST_HI) \ $(BINDIST_EXTRAS) \ @@ -932,7 +927,6 @@ $(eval $(call bindist,.,\ $(INSTALL_LIBEXECS) \ $(INSTALL_LIBEXEC_SCRIPTS) \ $(INSTALL_TOPDIRS) \ - $(INSTALL_TOPDIR_SCRIPTS) \ $(INSTALL_BINS) \ $(INSTALL_MANPAGES) \ $(INSTALL_DOCS) \ |