X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Finstall.mk.in;h=4d203101078ba31fab35d07093858aaac29ff982;hb=661c97c65e5fa47177502e592bb763f752b487ac;hp=75c2a32c18cc726ae4d5c49f610419ef01724686;hpb=926ae90b75cd3368049854898062a563e57c9ad2;p=ghc-hetmet.git

diff --git a/mk/install.mk.in b/mk/install.mk.in
index 75c2a32..4d20310 100644
--- a/mk/install.mk.in
+++ b/mk/install.mk.in
@@ -3,14 +3,14 @@
 #
 ################################################################################
 #
-# dirs.mk.in
+# install.mk.in
 #
 # This file sets up the installation directories.
 #
 # DO NOT EDIT THIS FILE!
 #
-# 	- dirs.mk is auto-generated from dirs.mk.in by configure.
-#	  If you edit dirs.mk your changes will be spammed.
+# 	- install.mk is auto-generated from install.mk.in by configure.
+#	  If you edit install.mk your changes will be spammed.
 #
 #	- Settings in this file may be overriden by giving replacement
 #	  definitions in build.mk.
@@ -45,8 +45,8 @@
 define set_default
 # $1 = variable to set
 # $2 = default value to use, if configure didn't expand it
-# If $1 starts with an @ then configure didn't set it,
-# so set it to a sensible value
+# If $1 starts with an @ then configure didn't set it (because a version
+# of autoconf that is too old was used), so set it to a sensible value
 ifneq "$$(filter @%,$$($1))" ""
 $1 = $2
 endif
@@ -67,9 +67,6 @@ libdir          = @libdir@
 includedir      = @includedir@
 mandir          = @mandir@
 
-# New autoconf (>= 2.60?) make a configure with --docdir=DIR etc flags.
-# However, in order to support older autoconf's we don't use them.
-
 docdir = @docdir@
 $(eval $(call set_default,docdir,$${datarootdir}/doc/ghc))
 
@@ -96,7 +93,8 @@ dvidir    = $(docdir)
 pdfdir    = $(docdir)
 psdir     = $(docdir)
 
-topdir = $(libdir)
+ghclibdir = $(libdir)
+ghcdocdir = $(datarootdir)/doc
 
 else
 
@@ -108,11 +106,11 @@ else
 # where package.conf is, so we just set it globally).
 #
 ghclibdir     = $(libdir)/ghc-$(ProjectVersion)
-ghclibexecdir = $(ghclibdir)
-topdir        = $(ghclibdir)
 ghcdocdir     = $(datarootdir)/doc/ghc
 endif
 
+ghclibexecdir = $(ghclibdir)
+topdir        = $(ghclibdir)
 ghcheaderdir  = $(ghclibdir)/include
 
 #-----------------------------------------------------------------------------
@@ -132,8 +130,8 @@ INSTALL_GROUP =
 # Invocations of `install' for the four different classes
 # of targets:
 #
-CREATE_SCRIPT   = create () { touch $$1 && chmod 755 $$1 ; } && create
-CREATE_DATA     = create () { touch $$1 && chmod 644 $$1 ; } && create
+CREATE_SCRIPT   = create () { touch "$$1" && chmod 755 "$$1" ; } && create
+CREATE_DATA     = create () { touch "$$1" && chmod 644 "$$1" ; } && create
 INSTALL_PROGRAM = $(INSTALL) -m 755
 INSTALL_SCRIPT  = $(INSTALL) -m 755
 INSTALL_SHLIB   = $(INSTALL) -m 755