diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-03-03 21:09:58 +0000 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-03-03 21:09:58 +0000 |
| commit | ddb4879ca33064d68e43b273d42c1624769c0cbe (patch) | |
| tree | 3888852e1abdfc48328b9819f176641835b02a76 | |
| parent | 1cb4b90334c17ea86606ef37ff6e0461ea56396a (diff) | |
| download | haskell-ddb4879ca33064d68e43b273d42c1624769c0cbe.tar.gz | |
Remove the _INSTALL_IN support in the build system
It doesn't seem to do anything that _INSTALL and _INSTALL_INPLACE
can't do.
| -rw-r--r-- | driver/split/ghc.mk | 3 | ||||
| -rw-r--r-- | rules/build-perl.mk | 10 |
2 files changed, 2 insertions, 11 deletions
diff --git a/driver/split/ghc.mk b/driver/split/ghc.mk index 0272652856..11e3eede96 100644 --- a/driver/split/ghc.mk +++ b/driver/split/ghc.mk @@ -13,7 +13,8 @@ driver/split_PERL_SRC = ghc-split.lprl driver/split_dist_PROG = $(GHC_SPLIT_PGM) driver/split_dist_TOPDIR = YES -driver/split_dist_INSTALL_IN = $(DESTDIR)$(topdir) +driver/split_dist_INSTALL = YES +driver/split_dist_INSTALL_INPLACE = YES $(eval $(call build-perl,driver/split,dist)) diff --git a/rules/build-perl.mk b/rules/build-perl.mk index 74c05b5b7f..ff2a6ff625 100644 --- a/rules/build-perl.mk +++ b/rules/build-perl.mk @@ -54,16 +54,6 @@ $$($1_$2_INPLACE): $1/$2/$$($1_$2_PROG) | $$$$(dir $$$$@)/. "$$(CP)" $$< $$@ $$(EXECUTABLE_FILE) $$@ -ifneq "$$($1_$2_INSTALL_IN)" "" -BINDIST_PERL_SOURCES += $1/$2/$$($1_$2_PROG).prl - -install: install_$1_$2 - -.PHONY: install_$1_$2 -install_$1_$2: $1/$2/$$($1_$2_PROG) - $$(call INSTALL_DIR,"$$($1_$2_INSTALL_IN)") - $$(call INSTALL_SCRIPT,$$(INSTALL_OPTS),$$<,"$$($1_$2_INSTALL_IN)") -endif endif $(call profEnd, build-perl($1,$2)) |