X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Finstall.mk.in;h=d1bce874a67c3cb7ecbab495562ec69ca9af66ac;hb=e6fb8c9e66351ea240a3b4eb36c40e4c42b91da5;hp=863a5984b0789bcedc54c9e3f9cfd587ebac4ba9;hpb=0dffc568e18d34eeb6d1899ea767a3814d6be167;p=ghc-hetmet.git

diff --git a/mk/install.mk.in b/mk/install.mk.in
index 863a598..d1bce87 100644
--- a/mk/install.mk.in
+++ b/mk/install.mk.in
@@ -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