diff options
| author | Ian Lynagh <igloo@earth.li> | 2009-08-14 22:45:49 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2009-08-14 22:45:49 +0000 |
| commit | 926ae90b75cd3368049854898062a563e57c9ad2 (patch) | |
| tree | 543ef37498be98d3cb18a587c26b589e8d78d311 /rules/build-prog.mk | |
| parent | 328681951873b54dade3d0ecef2bea9bf97fff29 (diff) | |
| download | haskell-926ae90b75cd3368049854898062a563e57c9ad2.tar.gz | |
Make our install variables etc compliant with GNU standards; fixes #1924
Diffstat (limited to 'rules/build-prog.mk')
| -rw-r--r-- | rules/build-prog.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rules/build-prog.mk b/rules/build-prog.mk index 6910e8f6e8..3631a90bf1 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 |