[LON-CAPA-cvs] cvs: loncom /build Makefile

raeburn raeburn@source.lon-capa.org
Thu, 24 Mar 2011 02:04:46 -0000


raeburn		Thu Mar 24 02:04:46 2011 EDT

  Modified files:              
    /loncom/build	Makefile 
  Log:
  - Bug 6356. Preserve original ownership of loncapa_apache.conf and
    about.html in CVS checkout when make install is run. 
  
  
Index: loncom/build/Makefile
diff -u loncom/build/Makefile:1.195 loncom/build/Makefile:1.196
--- loncom/build/Makefile:1.195	Thu Mar 10 16:41:42 2011
+++ loncom/build/Makefile	Thu Mar 24 02:04:46 2011
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 
-# $Id: Makefile,v 1.195 2011/03/10 16:41:42 raeburn Exp $
+# $Id: Makefile,v 1.196 2011/03/24 02:04:46 raeburn Exp $
 
 # TYPICAL USAGE of this Makefile is primarily for two targets:
 # "make build" and "make install".
@@ -545,9 +545,9 @@
 	date +"%Y%m%d" >> $(TARGET)/home/httpd/html/lon-status/version.txt
 
 aboutVERSION:
-	cp -v $(SOURCE)/loncom/license/about.html \
+	cp -p -v $(SOURCE)/loncom/license/about.html \
 	$(SOURCE)/loncom/license/about.html.orig
-	cp -v $(SOURCE)/loncom/loncapa_apache.conf \
+	cp -p -v $(SOURCE)/loncom/loncapa_apache.conf \
 	$(SOURCE)/loncom/loncapa_apache.conf.orig
 	cat $(SOURCE)/loncom/license/about.html | \
 	perl -e '$$d=`date +"%Y%m%d%H"`;chomp($$d);while(<>){s/(\<\!\-\- VERSION \-\-\>|\d+\.\d+\.CVS_HEAD\-\d{10})/$(SHOWVERSION)-$$d/; print;}' > \