projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ad7fa9d
)
[project @ 2001-08-21 13:14:51 by rrt]
author
rrt
<unknown>
Tue, 21 Aug 2001 13:14:51 +0000
(13:14 +0000)
committer
rrt
<unknown>
Tue, 21 Aug 2001 13:14:51 +0000
(13:14 +0000)
Fix include of config.h
ghc/utils/ghc-pkg/Main.hs
patch
|
blob
|
history
ghc/utils/ghc-pkg/Makefile
patch
|
blob
|
history
diff --git
a/ghc/utils/ghc-pkg/Main.hs
b/ghc/utils/ghc-pkg/Main.hs
index
9d922e9
..
3dfc264
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.13 2001/08/21 09:03:32 rrt Exp $
+-- $Id: Main.hs,v 1.14 2001/08/21 13:14:51 rrt Exp $
--
-- Package management tool
-----------------------------------------------------------------------------
--
-- Package management tool
-----------------------------------------------------------------------------
@@
-18,7
+18,7
@@
import Directory
import System
import IO
import System
import IO
-#include "../includes/config.h"
+#include "config.h"
#ifdef mingw32_TARGET_OS
import Win32DLL
#ifdef mingw32_TARGET_OS
import Win32DLL
@@
-69,9
+69,7
@@
runit clis = do
#else
[] -> do h <- getModuleHandle Nothing
n <- getModuleFileName h
#else
[] -> do h <- getModuleHandle Nothing
n <- getModuleFileName h
--- return (reverse (tail (dropWhile (not . isSlash)
return (reverse (drop (length "/bin/ghc-pkg.exe") (reverse (unDosifyPath n))) ++ "/package.conf")
return (reverse (drop (length "/bin/ghc-pkg.exe") (reverse (unDosifyPath n))) ++ "/package.conf")
--- (reverse (unDosifyPath n)))) ++ "/package.conf")
#endif
let toField "import_dirs" = return import_dirs
#endif
let toField "import_dirs" = return import_dirs
diff --git
a/ghc/utils/ghc-pkg/Makefile
b/ghc/utils/ghc-pkg/Makefile
index
a3df7b6
..
ad2d99b
100644
(file)
--- a/
ghc/utils/ghc-pkg/Makefile
+++ b/
ghc/utils/ghc-pkg/Makefile
@@
-1,5
+1,5
@@
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.9 2001/08/21 09:03:32 rrt Exp $
+# $Id: Makefile,v 1.10 2001/08/21 13:14:51 rrt Exp $
TOP=../..
include $(TOP)/mk/boilerplate.mk
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 \
HS_PROG = ghc-pkg.bin
SRC_HC_OPTS += -cpp -DPKG_TOOL -DWANT_PRETTY -package lang \
- -package util -package text
+ -package util -package text -I$(GHC_INCLUDE_DIR)
ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
SRC_HC_OPTS += -package win32
ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
SRC_HC_OPTS += -package win32