Make the alternative layout rule cope with file pragmas

[ghc-hetmet.git] / mk / install.mk.in

diff --git a/mk/install.mk.in b/mk/install.mk.in
index 75c2a32..d1bce87 100644 (file)
--- 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.
@@ -96,7 +96,8 @@ dvidir    = $(docdir)
 pdfdir    = $(docdir)
 psdir     = $(docdir)
 
-topdir = $(libdir)
+ghclibdir = $(libdir)
+ghcdocdir = $(datarootdir)/doc
 
 else
 
@@ -108,11 +109,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 +133,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