projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9905c28
)
Use := for PACKAGE_TARNAME, no reason for not doing so
author
sven.panne@aedion.de
<unknown>
Sat, 8 Sep 2007 12:46:45 +0000
(12:46 +0000)
committer
sven.panne@aedion.de
<unknown>
Sat, 8 Sep 2007 12:46:45 +0000
(12:46 +0000)
MERGE TO STABLE
mk/config.mk.in
patch
|
blob
|
history
diff --git
a/mk/config.mk.in
b/mk/config.mk.in
index
ba0fcc8
..
e0b9d3c
100644
(file)
--- a/
mk/config.mk.in
+++ b/
mk/config.mk.in
@@
-501,9
+501,6
@@
endif
# On Windows this is a c:/foo/bar style path.
FPTOOLS_TOP_ABS = @hardtop@
# On Windows this is a c:/foo/bar style path.
FPTOOLS_TOP_ABS = @hardtop@
-# This gets used in the default docdir
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-
BIN_DIST_NAME=ghc-$(ProjectVersion)
BIN_DIST_TOPDIR_REL=$(FPTOOLS_TOP)
BIN_DIST_TOPDIR_ABS=$(FPTOOLS_TOP_ABS)
BIN_DIST_NAME=ghc-$(ProjectVersion)
BIN_DIST_TOPDIR_REL=$(FPTOOLS_TOP)
BIN_DIST_TOPDIR_ABS=$(FPTOOLS_TOP_ABS)
@@
-539,6
+536,9
@@
BIN_DIST_INST_DIR = $(FPTOOLS_TOP_ABS)/bindisttest/installed
# string "${docdir}", not the value of docdir! This is crucial for the GNU
# coding standards.
# string "${docdir}", not the value of docdir! This is crucial for the GNU
# coding standards.
+# This gets used in the default docdir when autoconf >= 2.60 is used
+PACKAGE_TARNAME := @PACKAGE_TARNAME@
+
prefix := @prefix@
# New autoconf (>= 2.60?) make a configure with a --datarootdir=DIR flag.
prefix := @prefix@
# New autoconf (>= 2.60?) make a configure with a --datarootdir=DIR flag.