--- loncom/build/Makefile	2002/05/23 20:21:00	1.116
+++ loncom/build/Makefile	2002/07/19 18:54:41	1.128
@@ -1,14 +1,13 @@
 # The LearningOnline Network with CAPA
 
 # Scott Harrison
-# $Id: Makefile,v 1.116 2002/05/23 20:21:00 harris41 Exp $
+# $Id: Makefile,v 1.128 2002/07/19 18:54:41 harris41 Exp $
 
 DISTPROBE=`perl ./distprobe`
 DIST=$(DISTPROBE)
 CATEGORY="development"
 SOURCE=../..
 TARGET=""
-DIRTARGET=loncapa
 NORESTORECONF="0"
 HOSTNAME=""
 LAUNCH=| perl
@@ -18,7 +17,8 @@ SAVE=program.pl.$(TIMESTAMP)
 LAUNCHSAVE=$(OUTSTREAM) $(SAVE)
 METAMTARGET=""
 MTARGET=""
-VERSION=0.1
+VERSION=0.4
+DIRTARGET=loncapa-$(VERSION)
 
 help:
 	@echo "*** You need to specify a valid target ***"
@@ -42,7 +42,7 @@ help:
 	@echo "HTML: generate an HTML-formatted description of the LON-CAPA"
 	@echo "      CVS files"
 	@echo "documentation_tree: compiles a documentation tree from the "
-        @echo "                    CVS:doc directory"
+	@echo "                    CVS:doc directory"
 	@echo "status: compare the TARGET filesystem with a compiled CVS "
 	@echo "        source directory"
 	@echo "statuspost: post the results of "make status" to "
@@ -75,7 +75,7 @@ TEST_web_layer:
 
 TEST_hosts_tab:
 	@echo "Testing hosts.tab"
-	@if (test -h ../hosts.tab); then \
+	@if (test -e ../hosts.tab); then \
 		echo "there is a defined link; assume okay"; \
 	else echo "**** ERROR **** hosts.tab not defined!" && \
 	     echo -n "You need to do one of the following within your " && \
@@ -213,7 +213,23 @@ postinstall:
 	make webserverconf
 	make sanitycheck
 
-install: TEST_hosts_tab Makefile.install Makefile
+NET_rawinstall:
+	make TIMESTAMP=`date +"%s"` METAMTARGET="TRANSPORT" \
+	MTARGET="rawinstall" HOSTNAME="$(HOSTNAME)" lpmladm
+
+VERSION:
+	install -d $(TARGET)/etc
+	echo -n "LON-CAPA release $(VERSION)-" > $(TARGET)/etc/loncapa-release
+	date +"%Y%m%d" >> $(TARGET)/etc/loncapa-release
+
+aboutVERSION:
+	cat $(SOURCE)/loncom/license/about.html | \
+	perl -e '$$d=`date +"%Y%m%d"`;chomp($$d);while(<>){s/\<\!\-\- VERSION \-\-\>/$(VERSION)-$$d/; print;}' > \
+	$(SOURCE)/loncom/license/about.html.new
+	mv -v $(SOURCE)/loncom/license/about.html.new \
+	$(SOURCE)/loncom/license/about.html
+
+install: VERSION TEST_hosts_tab Makefile.install Makefile
 	echo -n "" > WARNINGS
 	make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" \
 	directories
@@ -229,7 +245,7 @@ install: TEST_hosts_tab Makefile.install
 	echo -n "(YOU MAY NEED TO REINITIALIZE YOUR MYSQL www\@localhost USER)"
 	echo -n "Please see http://install.lon-capa.org/ for more information"
 
-rawinstall: Makefile.install Makefile
+rawinstall: VERSION Makefile.install Makefile
 	echo -n "" > WARNINGS
 	make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" \
 	directories
@@ -340,6 +356,10 @@ doc:
 	cd docs/install; ln -fs ../installation_manual.pdf install.pdf
 	perl doc_template.pl $(SOURCE)/doc/templates/template.html \
 		$(SOURCE)/doc/build/install.html > docs/install/index.html
+	cp -v $(SOURCE)/doc/install/redhat7.3/new_install_rh73.html \
+		docs/install/rh73.html
+	cp -v $(SOURCE)/doc/install/redhat7.3/new_install_rh73.html \
+		docs/downloads/rh73.html
 	install -m 0755 -d docs/upgrade
 	cd docs/upgrade; ln -fs ../installation_manual.pdf upgrade.pdf
 	perl doc_template.pl $(SOURCE)/doc/templates/template.html \
@@ -371,7 +391,7 @@ pdfdoc: TEST_html2ps
 #	mpage -P- -1 -H [^C]* > ../../../loncom/build/pdfdoc/confexamples.ps
 	install -d pdfdoc/confexamples
 	cd $(SOURCE)/doc/build/confexamples; \
-	find . -type f | cut -b3- | grep -v '^C' | perl -nle \
+	find . -type f | cut -b3- | grep -v '^C' | grep -v 'keyword' | perl -nle \
 	'`mpage -P- -1 -H $$_ > ../../../loncom/build/pdfdoc/confexamples/$$_.ps`;'
 	echo '' > pdfdoc/contents.txt
 	echo '' >> pdfdoc/contents.txt
@@ -453,9 +473,11 @@ tardist:
 	echo 'ln -s loncom/build/WARNINGS WARNINGS' >> $(SOURCE)/UPDATE;
 	echo 'cd loncom/build; make build' >> $(SOURCE)/UPDATE
 	echo 'make rawinstall' >> $(SOURCE)/UPDATE
+	echo 'make configinstall' >> $(SOURCE)/UPDATE
 	echo 'make updatequery' >> $(SOURCE)/UPDATE
 	echo 'make hosts_tab' >> $(SOURCE)/UPDATE
 	echo 'make postinstall' >> $(SOURCE)/UPDATE
+	echo 'make aboutVERSION' >> $(SOURCE)/UPDATE
 	echo 'make warningnote' >> $(SOURCE)/UPDATE
 	# ----------------------------- Point TEST to the internal make process
 	echo '#!/bin/sh' > $(SOURCE)/TEST
@@ -483,9 +505,14 @@ tardist:
 	else \
 		ln -s . $(DIRTARGET); \
 	fi
+	cp -v $(SOURCE)/loncom/license/about.html \
+	$(SOURCE)/loncom/license/about.html.orig
+	make aboutVERSION
 	cd $(SOURCE); \
 	tar --no-recursion --numeric-owner --files-from MANIFEST_loncapa \
-	-h -czf loncapa.tar.gz 2>WARNINGS || [ "0" == "0" ]
+	-h -czf $(DIRTARGET).tar.gz 2>WARNINGS || [ "0" == "0" ]
+	mv -v $(SOURCE)/loncom/license/about.html.orig \
+	$(SOURCE)/loncom/license/about.html
 	cat $(SOURCE)/WARNINGS | \
 	xargs --replace=XXX echo '**** WARNING **** XXX' > WARNINGS
 	rm -f $(SOURCE)/WARNINGS