[project @ 2001-08-21 14:38:04 by sewardj]

Go back to using a relative path name for the config.h include.
This is for the same reason that we do so in ghc/compiler/*, which
is that saying -I$(GHC_INCLUDE_DIR) confuses 4.08 series compilers.

diff --git a/ghc/utils/ghc-pkg/Main.hs b/ghc/utils/ghc-pkg/Main.hs
index 3dfc264..7077d4b 100644 (file)
--- a/ghc/utils/ghc-pkg/Main.hs
+++ b/ghc/utils/ghc-pkg/Main.hs
@@ -1,5 +1,5 @@
 -----------------------------------------------------------------------------
--- $Id: Main.hs,v 1.14 2001/08/21 13:14:51 rrt Exp $
+-- $Id: Main.hs,v 1.15 2001/08/21 14:38:04 sewardj Exp $
 --
 -- Package management tool
 -----------------------------------------------------------------------------
@@ -18,7 +18,7 @@ import Directory
 import System
 import IO
 
-#include "config.h"
+#include "../../includes/config.h"
 
 #ifdef mingw32_TARGET_OS
 import Win32DLL

diff --git a/ghc/utils/ghc-pkg/Makefile b/ghc/utils/ghc-pkg/Makefile
index ad2d99b..3a61af1 100644 (file)
--- a/ghc/utils/ghc-pkg/Makefile
+++ b/ghc/utils/ghc-pkg/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.10 2001/08/21 13:14:51 rrt Exp $
+# $Id: Makefile,v 1.11 2001/08/21 14:38:04 sewardj Exp $
 
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
@@ -12,7 +12,7 @@ INSTALLING=1
 
 HS_PROG           = ghc-pkg.bin
 SRC_HC_OPTS      += -cpp -DPKG_TOOL -DWANT_PRETTY -package lang \
-                   -package util -package text -I$(GHC_INCLUDE_DIR)
+                   -package util -package text
 
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 SRC_HC_OPTS      += -package win32