[LON-CAPA-cvs] cvs: loncom(loncapaMITrelate_1) /build Makefile

[raeburn]

raeburn		Wed Feb  8 02:19:12 2012 EDT

  Modified files:              (Branch: loncapaMITrelate_1)
    /loncom/build	Makefile 
  Log:
  - Customization for MITrelate
    - Backport 1.200, 1.201.
  
  
Index: loncom/build/Makefile
diff -u loncom/build/Makefile:1.190.8.7.2.1 loncom/build/Makefile:1.190.8.7.2.2
--- loncom/build/Makefile:1.190.8.7.2.1	Wed Feb  8 01:59:58 2012
+++ loncom/build/Makefile	Wed Feb  8 02:19:12 2012
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 
-# $Id: Makefile,v 1.190.8.7.2.1 2012/02/08 01:59:58 raeburn Exp $
+# $Id: Makefile,v 1.190.8.7.2.2 2012/02/08 02:19:12 raeburn Exp $
 
 # TYPICAL USAGE of this Makefile is primarily for two targets:
 # "make build" and "make install".
@@ -547,6 +547,7 @@
 	make mimetex_version_check
 	make verify_domconfiguser
 	make latex_fmtutil
+	sed -i "s/\x08\x08*/.../g" WARNINGS
 VERSION:
 	install -d $(TARGET)/etc
 	echo -n "LON-CAPA release $(VERSION)-" > $(TARGET)/etc/loncapa-release
@@ -558,40 +559,52 @@
 aboutVERSION:
 	cp -p -v $(SOURCE)/loncom/license/about.html \
 	$(SOURCE)/loncom/license/about.html.orig
-	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;}' > \
 	$(SOURCE)/loncom/license/about.html.new
 	mv -v $(SOURCE)/loncom/license/about.html.new \
 	$(SOURCE)/loncom/license/about.html
+	touch --date="$(shell echo `perl getcvsdate.pl \
+	$(SOURCE)/loncom/license/CVS/Entries about.html`)" \
+	$(SOURCE)/loncom/license/about.html
+	cp -p -v $(SOURCE)/loncom/loncapa_apache.conf \
+	$(SOURCE)/loncom/loncapa_apache.conf.orig
 	cat $(SOURCE)/loncom/loncapa_apache.conf | \
 	perl -e '$$d=`date +"%Y%m%d%H"`;chomp($$d);while(<>){s/(\<\!\-\- VERSION \-\-\>|\d+\.\d+\.CVS_HEAD\-\d{10})/$(SHOWVERSION)-$$d/; print;}' > \
 	$(SOURCE)/loncom/loncapa_apache.conf.new
 	mv -v $(SOURCE)/loncom/loncapa_apache.conf.new \
 	$(SOURCE)/loncom/loncapa_apache.conf
+	touch --date="$(shell echo `perl getcvsdate.pl \
+	$(SOURCE)/loncom/CVS/Entries loncapa_apache.conf`)" \
+	$(SOURCE)/loncom/loncapa_apache.conf
 
 postaboutVERSION:
 	if (test -e $(SOURCE)/loncom/license/about.html.orig) && \
-		(diff $(SOURCE)/loncom/license/about.html \
+		(diff $(SOURCE)/loncom/license/about.html.orig \
 		$(SOURCE)/loncom/license/about.html > /dev/null); then \
 		mv -v $(SOURCE)/loncom/license/about.html.orig \
 		$(SOURCE)/loncom/license/about.html; \
 	elif (test -e $(SOURCE)/loncom/license/about.html.orig) && \
-		!(diff $(SOURCE)/loncom/license/about.html \
+		!(diff $(SOURCE)/loncom/license/about.html.orig \
 		$(SOURCE)/loncom/license/about.html > /dev/null); then \
 		rm -f $(SOURCE)/loncom/license/about.html.orig; \
 	fi
+	touch --date="$(shell echo `perl getcvsdate.pl \
+	$(SOURCE)/loncom/license/CVS/Entries about.html`)" \
+	$(SOURCE)/loncom/license/about.html
 	if (test -e $(SOURCE)/loncom/loncapa_apache.conf.orig) && \
-		(diff $(SOURCE)/loncom/license/about.html \
-		$(SOURCE)/loncom/license/about.html > /dev/null); then \
+		(diff $(SOURCE)/loncom/loncapa_apache.conf.orig \
+		$(SOURCE)/loncom/loncapa_apache.conf > /dev/null); then \
 		mv -v $(SOURCE)/loncom/loncapa_apache.conf.orig \
 		$(SOURCE)/loncom/loncapa_apache.conf; \
 	elif (test -e $(SOURCE)/loncom/loncapa_apache.conf.orig) && \
-		!(diff $(SOURCE)/loncom/license/about.html \
-		$(SOURCE)/loncom/license/about.html > /dev/null); then \
+		!(diff $(SOURCE)/loncom/loncapa_apache.conf.orig \
+		$(SOURCE)/loncom/loncapa_apache.conf > /dev/null); then \
 		rm -f $(SOURCE)/loncom/loncapa_apache.conf.orig; \
 	fi
+	touch --date="$(shell echo `perl getcvsdate.pl \
+	$(SOURCE)/loncom/CVS/Entries loncapa_apache.conf`)" \
+	$(SOURCE)/loncom/loncapa_apache.conf
 
 # ========= *** Makefile.* TARGETS BUILT DYNAMICALLY FROM loncapafiles.lpml ***