Configurable iconv header and library locations

[ghc-hetmet.git] / rules / build-prog.mk

diff --git a/rules/build-prog.mk b/rules/build-prog.mk
index 321de02..3631a90 100644 (file)
--- a/rules/build-prog.mk
+++ b/rules/build-prog.mk
@@ -126,8 +126,8 @@ else
 ifeq "$$($1_$2_SHELL_WRAPPER) $$(Windows)" "YES NO"
 $1_$2_INPLACE = $$(INPLACE_LIB)/$$($1_$2_PROG)
 else
-ifeq "$$($1_$2_LIBEXEC)" "YES"
-$1_$2_INPLACE = $$(INPLACE_LIB)/$$($1_$2_PROG)
+ifeq "$$($1_$2_TOPDIR)" "YES"
+$1_$2_INPLACE = $$(INPLACE_TOPDIR)/$$($1_$2_PROG)
 else
 $1_$2_INPLACE = $$(INPLACE_BIN)/$$($1_$2_PROG)
 endif
@@ -137,7 +137,7 @@ $(call all-target,$1_$2,$$($1_$2_INPLACE))
 $(call clean-target,$1,$2_inplace,$$($1_$2_INPLACE))
 
 # INPLACE_BIN might be empty if we're distcleaning
-ifneq "$$(INPLACE_BIN)" ""
+ifeq "$(findstring clean,$(MAKECMDGOALS))" ""
 $$($1_$2_INPLACE) : $1/$2/build/tmp/$$($1_$2_PROG) $$(MKDIRHIER)
        "$$(MKDIRHIER)" $$(dir $$@)
        "$$(CP)" -p $$< $$@
@@ -150,8 +150,8 @@ endif
 $(call shell-wrapper,$1,$2)
 
 ifeq "$$($1_$2_INSTALL)" "YES"
-ifeq "$$($1_$2_LIBEXEC)" "YES"
-INSTALL_LIBEXECS += $1/$2/build/tmp/$$($1_$2_PROG)
+ifeq "$$($1_$2_TOPDIR)" "YES"
+INSTALL_TOPDIRS += $1/$2/build/tmp/$$($1_$2_PROG)
 else
 INSTALL_BINS += $1/$2/build/tmp/$$($1_$2_PROG)
 endif