diff options
| author | Ian Lynagh <ian@well-typed.com> | 2012-09-27 01:57:19 +0100 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2012-09-27 02:01:11 +0100 |
| commit | 6e6da3a0d7cc227fadfd0dec6660364b265eb2ad (patch) | |
| tree | 74475f2852c0948aabfa6a1ff8244f914420b840 /rules/build-prog.mk | |
| parent | 7724ecb713eb67ddd6c53ffe6ceca9fd6607cefa (diff) | |
| download | haskell-6e6da3a0d7cc227fadfd0dec6660364b265eb2ad.tar.gz | |
Tweak the build system handling of shell wrappers
Rather than having a separate
foo_INSTALL_SHELL_WRAPPER
variable, we just use
foo_INSTALL && foo_SHELL_WRAPPER
Diffstat (limited to 'rules/build-prog.mk')
| -rw-r--r-- | rules/build-prog.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/rules/build-prog.mk b/rules/build-prog.mk index 27d410e1a0..2a76943301 100644 --- a/rules/build-prog.mk +++ b/rules/build-prog.mk @@ -184,10 +184,12 @@ endif $(call clean-target,$1,$2_inplace,$$($1_$2_INPLACE)) ifeq "$$($1_$2_INSTALL)" "YES" -ifeq "$$($1_$2_TOPDIR)" "YES" -INSTALL_TOPDIRS += $1/$2/build/tmp/$$($1_$2_PROG) +ifeq "$$($1_$2_SHELL_WRAPPER) $$(Windows)" "YES NO" +INSTALL_LIBEXECS += $1/$2/build/tmp/$$($1_$2_PROG) +else ifeq "$$($1_$2_TOPDIR)" "YES" +INSTALL_TOPDIRS += $1/$2/build/tmp/$$($1_$2_PROG) else -INSTALL_BINS += $1/$2/build/tmp/$$($1_$2_PROG) +INSTALL_BINS += $1/$2/build/tmp/$$($1_$2_PROG) endif endif |