X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fbuild-prog.mk;h=3631a90bf19dcd69b016a6b7d1e564803ecb0016;hb=0fc3078a039e7fdd16baf3537a534462d3023db1;hp=6910e8f6e8903d744d67c34a2bdae285e52732b5;hpb=39253008705e3ca590afdfa1b87bfbb5a16da7e7;p=ghc-hetmet.git diff --git a/rules/build-prog.mk b/rules/build-prog.mk index 6910e8f..3631a90 100644 --- 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 @@ -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