[hoc-cvs] hoc/Foundation .cvsignore,1.1,1.2 Foundation-macos.conf.in,1.2,1.3 Makefile.in,1.7,1.8

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc/Foundation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23694/Foundation

Modified Files:
	.cvsignore Foundation-macos.conf.in Makefile.in 
Log Message:
More GHC 6.4 compilation fixes



Index: Makefile.in
===================================================================
RCS file: /cvsroot/hoc/hoc/Foundation/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile.in	31 Mar 2005 15:57:47 -0000	1.7
+++ Makefile.in	31 Mar 2005 16:37:57 -0000	1.8
@@ -9,10 +9,9 @@
 
 all: libHSFoundation.a HSFoundation.o register-inplace
 
-register-inplace:
+register-inplace: Foundation.conf-inplace
 	[ -f "../inplace.conf" ] || echo '[]' > ../inplace.conf
-	$(GHC_PKG) unregister --force --package-conf=../inplace.conf Foundation || true
-	$(GHC_PKG) register Foundation.conf-inplace \
+	$(GHC_PKG) update Foundation.conf-inplace \
 		--package-conf=../inplace.conf
 
 exposed-modules.txt:
@@ -23,8 +22,8 @@
 Foundation.conf-inplace: Foundation-$(PLATFORM).conf-inplace.in exposed-modules.txt
 	cat Foundation-$(PLATFORM).conf-inplace.in exposed-modules.txt > Foundation.conf-inplace
 
-Foundation.conf: Foundation-$(PLATFORM).conf.in exposed-modules.txt
-	cat Foundation-$(PLATFORM).conf.in exposed-modules.txt > Foundation.conf
+Foundation.conf: Foundation-$(PLATFORM).conf exposed-modules.txt
+	cat Foundation-$(PLATFORM).conf exposed-modules.txt > Foundation.conf
 
 ghcmake: ghcmake.build-stamp
 
@@ -73,5 +72,5 @@
 	cp -R libHSFoundation.a HSFoundation.o build/imports \
 		$(GHC_LIB_PATH)/Foundation/
 	ranlib $(GHC_LIB_PATH)/Foundation/libHSFoundation.a
-	$(GHC_PKG) register Foundation.conf
+	$(GHC_PKG) update Foundation.conf
 

Index: Foundation-macos.conf.in
===================================================================
RCS file: /cvsroot/hoc/hoc/Foundation/Foundation-macos.conf.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Foundation-macos.conf.in	31 Mar 2005 15:57:46 -0000	1.2
+++ Foundation-macos.conf.in	31 Mar 2005 16:37:57 -0000	1.3
@@ -2,8 +2,8 @@
 maintainer:         wol...@gm...
 exposed:            True
 
-import-dirs:	    "$libdir/Foundation/imports"
-library-dirs:	    "$libdir/Foundation/"
+import-dirs:	    "@GHC_LIB_PATH@/Foundation/imports"
+library-dirs:	    "@GHC_LIB_PATH@/Foundation/"
 hs-libraries:	    "HSFoundation"
 frameworks:         "Foundation"
 depends:            HOC

Index: .cvsignore
===================================================================
RCS file: /cvsroot/hoc/hoc/Foundation/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- .cvsignore	31 Mar 2005 15:41:25 -0000	1.1
+++ .cvsignore	31 Mar 2005 16:37:57 -0000	1.2
@@ -3,3 +3,5 @@
 Foundation.conf-inplace
 ghcmake.build-stamp
 Makefile
+Foundation-macos.conf
+Foundation.conf