From 44886baea4f683939c15cf2d16f1387f4c9df048 Mon Sep 17 00:00:00 2001
From: sof <unknown>
Date: Mon, 30 Aug 2004 15:43:14 +0000
Subject: [PATCH 1/1] [project @ 2004-08-30 15:43:14 by sof] escape
 GHC_PKG_VERSION double quotes on all platforms when
 compiling with <=6.0.x

---
 ghc/utils/ghc-pkg/Makefile |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ghc/utils/ghc-pkg/Makefile b/ghc/utils/ghc-pkg/Makefile
index 26003d0..7e31597 100644
--- a/ghc/utils/ghc-pkg/Makefile
+++ b/ghc/utils/ghc-pkg/Makefile
@@ -14,7 +14,9 @@ ghc_le_600 = $(shell if (test $(GhcCanonVersion) -le 600); then echo YES; else e
 
 SRC_HC_OPTS      += -cpp -DPKG_TOOL -DWANT_PRETTY
 
-ifeq "$(HOSTPLATFORM)$(ghc_le_600)" "i386-unknown-mingw32YES"
+# <= 6.0.x quotes all arguments when invoking utils (using double quotes), hence
+# the need to escape the double quotes. >= 6.2.x does not.
+ifeq "$(ghc_le_600)" "NO"
 SRC_HC_OPTS += -D'GHC_PKG_VERSION=\"$(ProjectVersion)\"'
 else
 SRC_HC_OPTS += -D'GHC_PKG_VERSION="$(ProjectVersion)"'
-- 
1.7.10.4