From: simonmar <unknown>
Date: Thu, 12 Aug 2004 12:16:53 +0000 (+0000)
Subject: [project @ 2004-08-12 12:16:53 by simonmar]
X-Git-Tag: Initial_conversion_from_CVS_complete~1753
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=407e07594462b96a7632ccafa1c02ad3f82fa8db;p=ghc-hetmet.git

[project @ 2004-08-12 12:16:53 by simonmar]
Avoid string gaps.
---

diff --git a/ghc/utils/ghc-pkg/Main.hs b/ghc/utils/ghc-pkg/Main.hs
index 29040e4..34b6f4d 100644
--- a/ghc/utils/ghc-pkg/Main.hs
+++ b/ghc/utils/ghc-pkg/Main.hs
@@ -84,8 +84,7 @@ copyright = "GHC package manager version " ++ version ++ "\n"
 
 -- hackery to convice cpp to splice GHC_PKG_VERSION into a string
 version :: String
-version = tail "\ 
-   \ GHC_PKG_VERSION"
+version = GHC_PKG_VERSION
 
 usageHeader :: String -> String
 usageHeader prog = "Usage: " ++ prog ++ " [OPTION...]\n"
@@ -256,9 +255,9 @@ checkConfigAccess filename = do
 maybeRestoreOldConfig :: FilePath -> IO () -> IO ()
 maybeRestoreOldConfig filename io
   = my_catch io (\e -> do
-        hPutStr stdout "\nWARNING: an error was encountered while the new \n\ 
-        	       \configuration was being written.  Attempting to \n\ 
-        	       \restore the old configuration... "
+        hPutStr stdout ("\nWARNING: an error was encountered while the new \n"++
+        	          "configuration was being written.  Attempting to \n"++
+        	          "restore the old configuration... ")
 	renameFile (filename ++ ".old")  filename
         hPutStrLn stdout "done."
 	my_throw e
diff --git a/ghc/utils/ghc-pkg/Makefile b/ghc/utils/ghc-pkg/Makefile
index 64fe4ff..45d2eff 100644
--- a/ghc/utils/ghc-pkg/Makefile
+++ b/ghc/utils/ghc-pkg/Makefile
@@ -9,7 +9,7 @@ INSTALLING=1
 # -----------------------------------------------------------------------------
 # ghc-pkg.bin
 
-SRC_HC_OPTS      += -cpp -DPKG_TOOL -DWANT_PRETTY -DGHC_PKG_VERSION=$(ProjectVersion)
+SRC_HC_OPTS      += -cpp -DPKG_TOOL -DWANT_PRETTY -D'GHC_PKG_VERSION="$(ProjectVersion)"'
 
 ghc_ge_504 = $(shell if (test $(GhcCanonVersion) -ge 504); then echo YES; else echo NO; fi)