summaryrefslogtreecommitdiff
path: root/driver
diff options
context:
space:
mode:
authorIan Lynagh <ian@well-typed.com>2013-03-03 22:49:41 +0000
committerIan Lynagh <ian@well-typed.com>2013-03-03 22:52:50 +0000
commit2b85372ca18115bb1d6363256fcea6f54e415bed (patch)
tree1ccbbac74ddbb89430cc07cbdedd9b48a5a44662 /driver
parent8640750e136f98767fc0678b35a20a6fb7970241 (diff)
downloadhaskell-2b85372ca18115bb1d6363256fcea6f54e415bed.tar.gz
Automatically add the $(exeext) to program names
We now define _PROGNAME, and _PROG is automatically defined with $(exeext). This will shortly automatically use the right exeext depending on what stage it is being compiled with (exeext may be different for different stages when cross-compiling).
Diffstat (limited to 'driver')
-rw-r--r--driver/ghc/ghc.mk2
-rw-r--r--driver/ghci/ghc.mk2
-rw-r--r--driver/haddock/ghc.mk2
-rw-r--r--driver/split/ghc.mk2
4 files changed, 4 insertions, 4 deletions
diff --git a/driver/ghc/ghc.mk b/driver/ghc/ghc.mk
index dee9d5715c..31df04a988 100644
--- a/driver/ghc/ghc.mk
+++ b/driver/ghc/ghc.mk
@@ -14,7 +14,7 @@ ifeq "$(Windows_Host)" "YES"
driver/ghc_dist_C_SRCS = ghc.c ../utils/cwrapper.c ../utils/getLocation.c
driver/ghc_dist_CC_OPTS += -I driver/utils
-driver/ghc_dist_PROG = ghc-$(ProjectVersion)
+driver/ghc_dist_PROGNAME = ghc-$(ProjectVersion)
driver/ghc_dist_INSTALL = YES
driver/ghc_dist_INSTALL_INPLACE = NO
diff --git a/driver/ghci/ghc.mk b/driver/ghci/ghc.mk
index c231347c0b..736b7a927d 100644
--- a/driver/ghci/ghc.mk
+++ b/driver/ghci/ghc.mk
@@ -31,7 +31,7 @@ else # Windows_Host...
driver/ghci_dist_C_SRCS = ghci.c ../utils/cwrapper.c ../utils/getLocation.c
driver/ghci_dist_CC_OPTS += -I driver/utils
-driver/ghci_dist_PROG = ghci$(exeext)
+driver/ghci_dist_PROGNAME = ghci
driver/ghci_dist_INSTALL = YES
driver/ghci_dist_INSTALL_INPLACE = YES
driver/ghci_dist_OTHER_OBJS = driver/ghci/ghci.res
diff --git a/driver/haddock/ghc.mk b/driver/haddock/ghc.mk
index 06a6cecc30..3fe7174353 100644
--- a/driver/haddock/ghc.mk
+++ b/driver/haddock/ghc.mk
@@ -14,7 +14,7 @@ ifeq "$(Windows_Host)" "YES"
driver/haddock_dist_C_SRCS = haddock.c ../utils/cwrapper.c ../utils/getLocation.c
driver/haddock_dist_CC_OPTS += -I driver/utils
-driver/haddock_dist_PROG = haddock-$(ProjectVersion)
+driver/haddock_dist_PROGNAME = haddock-$(ProjectVersion)
driver/haddock_dist_INSTALL = YES
driver/haddock_dist_INSTALL_INPLACE = NO
diff --git a/driver/split/ghc.mk b/driver/split/ghc.mk
index 9ee4cd604e..461dd5ac62 100644
--- a/driver/split/ghc.mk
+++ b/driver/split/ghc.mk
@@ -11,7 +11,7 @@
# -----------------------------------------------------------------------------
driver/split_PERL_SRC = ghc-split.lprl
-driver/split_dist_PROG = ghc-split
+driver/split_dist_PROGNAME = ghc-split
driver/split_dist_TOPDIR = YES
driver/split_dist_INSTALL = YES
driver/split_dist_INSTALL_INPLACE = YES