diff options
Diffstat (limited to 'utils')
-rw-r--r-- | utils/compare_sizes/ghc.mk | 2 | ||||
-rw-r--r-- | utils/count_lines/ghc.mk | 2 | ||||
-rw-r--r-- | utils/deriveConstants/ghc.mk | 2 | ||||
-rw-r--r-- | utils/genapply/ghc.mk | 2 | ||||
-rw-r--r-- | utils/genprimopcode/ghc.mk | 2 | ||||
-rw-r--r-- | utils/ghc-cabal/ghc.mk | 2 | ||||
-rw-r--r-- | utils/ghc-pkg/ghc.mk | 6 | ||||
-rw-r--r-- | utils/ghc-pwd/ghc.mk | 2 | ||||
-rw-r--r-- | utils/ghctags/ghc.mk | 2 | ||||
-rw-r--r-- | utils/hp2ps/ghc.mk | 2 | ||||
-rw-r--r-- | utils/hpc/ghc.mk | 2 | ||||
-rw-r--r-- | utils/mkUserGuidePart/ghc.mk | 2 | ||||
-rw-r--r-- | utils/runghc/ghc.mk | 2 | ||||
-rw-r--r-- | utils/touchy/ghc.mk | 2 | ||||
-rw-r--r-- | utils/unlit/ghc.mk | 2 |
15 files changed, 16 insertions, 18 deletions
diff --git a/utils/compare_sizes/ghc.mk b/utils/compare_sizes/ghc.mk index 7a7142c19b..d659a5e6d8 100644 --- a/utils/compare_sizes/ghc.mk +++ b/utils/compare_sizes/ghc.mk @@ -2,7 +2,7 @@ utils/compare_sizes_USES_CABAL = YES utils/compare_sizes_PACKAGE = compareSizes utils/compare_sizes_MODULES = Main -utils/compare_sizes_dist-install_PROG = compareSizes$(exeext) +utils/compare_sizes_dist-install_PROGNAME = compareSizes utils/compare_sizes_dist-install_INSTALL_INPLACE = NO $(eval $(call build-prog,utils/compare_sizes,dist-install,1)) diff --git a/utils/count_lines/ghc.mk b/utils/count_lines/ghc.mk index c467413381..4f3f43e77a 100644 --- a/utils/count_lines/ghc.mk +++ b/utils/count_lines/ghc.mk @@ -1,5 +1,5 @@ utils/count_lines_PERL_SRC = count_lines.lprl -utils/count_lines_dist_PROG = count_lines +utils/count_lines_dist_PROGNAME = count_lines $(eval $(call build-perl,utils/count_lines,dist)) diff --git a/utils/deriveConstants/ghc.mk b/utils/deriveConstants/ghc.mk index f181077080..525a936960 100644 --- a/utils/deriveConstants/ghc.mk +++ b/utils/deriveConstants/ghc.mk @@ -11,7 +11,7 @@ # ----------------------------------------------------------------------------- utils/deriveConstants_dist_MODULES = DeriveConstants -utils/deriveConstants_dist_PROG = deriveConstants$(exeext) +utils/deriveConstants_dist_PROGNAME = deriveConstants utils/deriveConstants_dist_INSTALL_INPLACE = YES utils/deriveConstants_HC_OPTS += -package process -package containers diff --git a/utils/genapply/ghc.mk b/utils/genapply/ghc.mk index cd42cb4e34..14b003c042 100644 --- a/utils/genapply/ghc.mk +++ b/utils/genapply/ghc.mk @@ -11,7 +11,7 @@ # ----------------------------------------------------------------------------- utils/genapply_dist_MODULES = GenApply -utils/genapply_dist_PROG = genapply$(exeext) +utils/genapply_dist_PROGNAME = genapply utils/genapply_dist_INSTALL_INPLACE = YES utils/genapply_HC_OPTS += -package pretty diff --git a/utils/genprimopcode/ghc.mk b/utils/genprimopcode/ghc.mk index b4fb6c01de..01229ce0dd 100644 --- a/utils/genprimopcode/ghc.mk +++ b/utils/genprimopcode/ghc.mk @@ -11,7 +11,7 @@ # ----------------------------------------------------------------------------- utils/genprimopcode_dist_MODULES = Lexer Main ParserM Parser Syntax -utils/genprimopcode_dist_PROG = genprimopcode$(exeext) +utils/genprimopcode_dist_PROGNAME = genprimopcode utils/genprimopcode_dist_HC_OPTS = -package array utils/genprimopcode_dist_INSTALL_INPLACE = YES diff --git a/utils/ghc-cabal/ghc.mk b/utils/ghc-cabal/ghc.mk index 5835749d9f..c80c4ef7ef 100644 --- a/utils/ghc-cabal/ghc.mk +++ b/utils/ghc-cabal/ghc.mk @@ -57,7 +57,7 @@ $(eval $(call all-target,utils/ghc-cabal,$(ghc-cabal_INPLACE))) utils/ghc-cabal_USES_CABAL = YES utils/ghc-cabal_PACKAGE = ghc-cabal -utils/ghc-cabal_dist-install_PROG = ghc-cabal$(exeext) +utils/ghc-cabal_dist-install_PROGNAME = ghc-cabal utils/ghc-cabal_dist-install_INSTALL_INPLACE = NO utils/ghc-cabal_dist-install_WANT_BINDIST_WRAPPER = YES utils/ghc-cabal_dist-install_MODULES = Main diff --git a/utils/ghc-pkg/ghc.mk b/utils/ghc-pkg/ghc.mk index 4464ba1cde..51c3cb4c36 100644 --- a/utils/ghc-pkg/ghc.mk +++ b/utils/ghc-pkg/ghc.mk @@ -34,14 +34,12 @@ utils/ghc-pkg_dist_SHELL_WRAPPER = YES utils/ghc-pkg_dist_INSTALL_SHELL_WRAPPER_NAME = ghc-pkg-$(ProjectVersion) utils/ghc-pkg_dist_WANT_INSTALLED_WRAPPER = YES -INSTALL_LIBEXECS += utils/ghc-pkg/dist/build/tmp/$(utils/ghc-pkg_dist_PROG) - $(eval $(call shell-wrapper,utils/ghc-pkg,dist)) endif utils/ghc-pkg_dist_USES_CABAL = YES -utils/ghc-pkg_dist_PROG = ghc-pkg$(exeext) +utils/ghc-pkg_dist_PROGNAME = ghc-pkg utils/ghc-pkg_dist_SHELL_WRAPPER = YES utils/ghc-pkg_dist_INSTALL_INPLACE = YES @@ -59,7 +57,7 @@ ifneq "$(Stage1Only)" "YES" utils/ghc-pkg_dist-install_USES_CABAL = YES -utils/ghc-pkg_dist-install_PROG = ghc-pkg +utils/ghc-pkg_dist-install_PROGNAME = ghc-pkg utils/ghc-pkg_dist-install_SHELL_WRAPPER = YES utils/ghc-pkg_dist-install_INSTALL = YES utils/ghc-pkg_dist-install_INSTALL_SHELL_WRAPPER_NAME = ghc-pkg-$(ProjectVersion) diff --git a/utils/ghc-pwd/ghc.mk b/utils/ghc-pwd/ghc.mk index e9c0d4aff4..ac6bc768f6 100644 --- a/utils/ghc-pwd/ghc.mk +++ b/utils/ghc-pwd/ghc.mk @@ -3,7 +3,7 @@ utils/ghc-pwd_USES_CABAL = YES utils/ghc-pwd_PACKAGE = ghc-pwd utils/ghc-pwd_dist-install_INSTALL_INPLACE = YES utils/ghc-pwd_dist-install_WANT_BINDIST_WRAPPER = YES -utils/ghc-pwd_dist-install_PROG = ghc-pwd$(exeext) +utils/ghc-pwd_dist-install_PROGNAME = ghc-pwd $(eval $(call build-prog,utils/ghc-pwd,dist-install,1)) diff --git a/utils/ghctags/ghc.mk b/utils/ghctags/ghc.mk index 949a05174b..07ab41e9f5 100644 --- a/utils/ghctags/ghc.mk +++ b/utils/ghctags/ghc.mk @@ -12,7 +12,7 @@ utils/ghctags_USES_CABAL = YES utils/ghctags_PACKAGE = ghctags -utils/ghctags_dist-install_PROG = ghctags$(exeext) +utils/ghctags_dist-install_PROGNAME = ghctags utils/ghctags_dist-install_INSTALL = NO utils/ghctags_dist-install_INSTALL_INPLACE = YES $(eval $(call build-prog,utils/ghctags,dist-install,2)) diff --git a/utils/hp2ps/ghc.mk b/utils/hp2ps/ghc.mk index 097f912dcb..00923d3d78 100644 --- a/utils/hp2ps/ghc.mk +++ b/utils/hp2ps/ghc.mk @@ -16,7 +16,7 @@ utils/hp2ps_dist_C_SRCS = AreaBelow.c Curves.c Error.c Main.c \ Axes.c Dimensions.c Key.c PsFile.c Shade.c \ Utilities.c utils/hp2ps_dist_EXTRA_LIBRARIES = m -utils/hp2ps_dist_PROG = $(CrossCompilePrefix)hp2ps$(exeext) +utils/hp2ps_dist_PROGNAME = $(CrossCompilePrefix)hp2ps utils/hp2ps_dist_INSTALL = YES utils/hp2ps_dist_INSTALL_INPLACE = YES diff --git a/utils/hpc/ghc.mk b/utils/hpc/ghc.mk index 917e099ef8..60c13d411e 100644 --- a/utils/hpc/ghc.mk +++ b/utils/hpc/ghc.mk @@ -14,5 +14,5 @@ utils/hpc_USES_CABAL = YES utils/hpc_PACKAGE = hpc-bin utils/hpc_dist-install_INSTALL = YES utils/hpc_dist-install_INSTALL_INPLACE = YES -utils/hpc_dist-install_PROG = hpc$(exeext) +utils/hpc_dist-install_PROGNAME = hpc $(eval $(call build-prog,utils/hpc,dist-install,1)) diff --git a/utils/mkUserGuidePart/ghc.mk b/utils/mkUserGuidePart/ghc.mk index ae305f9139..aabe69ae4e 100644 --- a/utils/mkUserGuidePart/ghc.mk +++ b/utils/mkUserGuidePart/ghc.mk @@ -12,7 +12,7 @@ utils/mkUserGuidePart_USES_CABAL = YES utils/mkUserGuidePart_PACKAGE = mkUserGuidePart -utils/mkUserGuidePart_dist_PROG = mkUserGuidePart$(exeext) +utils/mkUserGuidePart_dist_PROGNAME = mkUserGuidePart utils/mkUserGuidePart_dist_INSTALL_INPLACE = YES $(eval $(call build-prog,utils/mkUserGuidePart,dist,1)) diff --git a/utils/runghc/ghc.mk b/utils/runghc/ghc.mk index a181938f3b..cde8102312 100644 --- a/utils/runghc/ghc.mk +++ b/utils/runghc/ghc.mk @@ -12,7 +12,7 @@ utils/runghc_PACKAGE = runghc utils/runghc_dist-install_USES_CABAL = YES -utils/runghc_dist-install_PROG = runghc$(exeext) +utils/runghc_dist-install_PROGNAME = runghc utils/runghc_dist-install_SHELL_WRAPPER = YES utils/runghc_dist-install_INSTALL = YES utils/runghc_dist-install_INSTALL_INPLACE = YES diff --git a/utils/touchy/ghc.mk b/utils/touchy/ghc.mk index 8c316ba993..b2911aaaa6 100644 --- a/utils/touchy/ghc.mk +++ b/utils/touchy/ghc.mk @@ -11,7 +11,7 @@ # ----------------------------------------------------------------------------- utils/touchy_dist_C_SRCS = touchy.c -utils/touchy_dist_PROG = touchy$(exeext) +utils/touchy_dist_PROGNAME = touchy utils/touchy_dist_TOPDIR = YES utils/touchy_dist_INSTALL = YES utils/touchy_dist_INSTALL_INPLACE = YES diff --git a/utils/unlit/ghc.mk b/utils/unlit/ghc.mk index 597a9018c2..765c96969b 100644 --- a/utils/unlit/ghc.mk +++ b/utils/unlit/ghc.mk @@ -11,7 +11,7 @@ # ----------------------------------------------------------------------------- utils/unlit_dist_C_SRCS = unlit.c -utils/unlit_dist_PROG = unlit$(exeext) +utils/unlit_dist_PROGNAME = unlit utils/unlit_dist_TOPDIR = YES utils/unlit_dist_INSTALL = YES utils/unlit_dist_INSTALL_INPLACE = YES |