[hoc-cvs] hoc/Foundation Foundation-macos.conf-inplace.in,1.1,1.2 Foundation-macos.conf.in,1.1,1.2 Makefile.in,1.6,1.7

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

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

Modified Files:
	Foundation-macos.conf-inplace.in Foundation-macos.conf.in 
	Makefile.in 
Log Message:
Get Foundation/ directory compiling with GHC 6.4



Index: Makefile.in
===================================================================
RCS file: /cvsroot/hoc/hoc/Foundation/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.in	6 Dec 2004 03:46:50 -0000	1.6
+++ Makefile.in	31 Mar 2005 15:57:47 -0000	1.7
@@ -7,9 +7,10 @@
 	Makefile.in \
 	$(NULL)
 
-all: libHSFoundation.a HSFoundation.o ../inplace.conf
+all: libHSFoundation.a HSFoundation.o register-inplace
 
-../inplace.conf: Foundation.conf-inplace
+register-inplace:
+	[ -f "../inplace.conf" ] || echo '[]' > ../inplace.conf
 	$(GHC_PKG) unregister --force --package-conf=../inplace.conf Foundation || true
 	$(GHC_PKG) register Foundation.conf-inplace \
 		--package-conf=../inplace.conf

Index: Foundation-macos.conf.in
===================================================================
RCS file: /cvsroot/hoc/hoc/Foundation/Foundation-macos.conf.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Foundation-macos.conf.in	6 Dec 2004 03:46:50 -0000	1.1
+++ Foundation-macos.conf.in	31 Mar 2005 15:57:46 -0000	1.2
@@ -5,7 +5,7 @@
 import-dirs:	    "$libdir/Foundation/imports"
 library-dirs:	    "$libdir/Foundation/"
 hs-libraries:	    "HSFoundation"
-extra-frameworks:   "Foundation"
+frameworks:         "Foundation"
 depends:            HOC
 
 exposed-modules:

Index: Foundation-macos.conf-inplace.in
===================================================================
RCS file: /cvsroot/hoc/hoc/Foundation/Foundation-macos.conf-inplace.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Foundation-macos.conf-inplace.in	6 Dec 2004 03:46:50 -0000	1.1
+++ Foundation-macos.conf-inplace.in	31 Mar 2005 15:57:46 -0000	1.2
@@ -5,7 +5,7 @@
 import-dirs:	    "../Foundation/build/imports"
 library-dirs:	    "../Foundation"
 hs-libraries:	    "HSFoundation"
-extra-frameworks:   "Foundation"
+frameworks:         "Foundation"
 depends:            HOC
 
 exposed-modules: