[hoc-cvs] hoc/Foundation .cvsignore,1.2,1.3 Makefile.in,1.15,1.16

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

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

Modified Files:
	.cvsignore Makefile.in 
Log Message:
Change register-inplace target so that it doesn't attempt to update
inplace.conf if it's up-to-date.  This fixes the long-standing annoyance that
inplace.conf will be owned by root if 'sudo make install' is invoked.



Index: Makefile.in
===================================================================
RCS file: /cvsroot/hoc/hoc/Foundation/Makefile.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile.in	6 Aug 2005 16:29:11 -0000	1.15
+++ Makefile.in	6 Aug 2005 16:38:20 -0000	1.16
@@ -7,12 +7,13 @@
 	Makefile.in \
 	$(NULL)
 
-all: libHSFoundation.a HSFoundation.o register-inplace
+all: libHSFoundation.a HSFoundation.o register-inplace.build-stamp
 
-register-inplace: Foundation.conf-inplace
+register-inplace.build-stamp: Foundation.conf-inplace
 	[ -f "../inplace.conf" ] || echo '[]' > ../inplace.conf
 	$(GHC_PKG) update Foundation.conf-inplace \
 		--package-conf=../inplace.conf
+	touch $@
 
 exposed-modules.txt:
 	find build/imports | grep '\.hi' \
@@ -72,7 +73,8 @@
 clean:
 	rm -rf build libHSFoundation.a libHSFoundation_dyn.dylib \
 	    HSFoundation.o Foundation.hs Foundation ghcmake.build-stamp \
-	    exposed-modules.txt Foundation.conf Foundation.conf-inplace
+	    exposed-modules.txt Foundation.conf Foundation.conf-inplace \
+	    register-inplace.build-stamp
 	
 install: install-files
 	ranlib "$(destdir)"/$(GHC_LIB_PATH)/Foundation/libHSFoundation.a

Index: .cvsignore
===================================================================
RCS file: /cvsroot/hoc/hoc/Foundation/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- .cvsignore	31 Mar 2005 16:37:57 -0000	1.2
+++ .cvsignore	6 Aug 2005 16:38:20 -0000	1.3
@@ -5,3 +5,5 @@
 Makefile
 Foundation-macos.conf
 Foundation.conf
+register-inplace.build-stamp
+