[commit: ghc] master: Remove the _INSTALL_IN support in the build system (ddb4879)

Ian Lynagh igloo at earth.li
Sun Mar 3 23:23:25 CET 2013


Repository : http://darcs.haskell.org/ghc.git/

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/ddb4879ca33064d68e43b273d42c1624769c0cbe

>---------------------------------------------------------------

commit ddb4879ca33064d68e43b273d42c1624769c0cbe
Author: Ian Lynagh <ian at well-typed.com>
Date:   Sun Mar 3 21:09:58 2013 +0000

    Remove the _INSTALL_IN support in the build system
    
    It doesn't seem to do anything that _INSTALL and _INSTALL_INPLACE
    can't do.

>---------------------------------------------------------------

 driver/split/ghc.mk |  3 ++-
 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 0272652..11e3eed 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 74c05b5..ff2a6ff 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))





More information about the ghc-commits mailing list