--- loncom/build/Makefile	2002/12/11 22:20:11	1.137
+++ loncom/build/Makefile	2003/05/29 23:10:16	1.147
@@ -1,7 +1,6 @@
 # The LearningOnline Network with CAPA
 
-# Scott Harrison, your friendly neighborhood volunteer
-# $Id: Makefile,v 1.137 2002/12/11 22:20:11 albertel Exp $
+# $Id: Makefile,v 1.147 2003/05/29 23:10:16 albertel Exp $
 
 # TYPICAL USAGE of this Makefile is primarily for two targets:
 # "make build" and "make install".
@@ -23,8 +22,13 @@ SAVE=program.pl.$(TIMESTAMP)
 LAUNCHSAVE=$(OUTSTREAM) $(SAVE)
 METAMTARGET=""
 MTARGET=""
-VERSION=0.5
+VERSION=0.99.1
+# The current working definition for "RELEASE" is: changes not in the software,
+# but in the operating system dependent packaging of the software.  Thus, the
+# generic tarball releases do not need to have a release number specified.
+RELEASE=1 # As a general rule for now, this is always being set to "1".
 DIRTARGET=loncapa-$(VERSION)
+LOCALAUTHPATH=/home/httpd/lib/perl
 
 # =============================================== Help targets for the Makefile
 # If 'make' is run without any arguments, the 'help' target is called since
@@ -195,6 +199,9 @@ help_TARGETS:
 	@echo "        instructor data (NOT YET IMPLEMENTED)"
 	@echo "restore: reseeds a LON-CAPA server with tarball backups "
 	@echo "         generated by \"make backup\" (NOT YET IMPLEMENTED)"
+	@echo "*** AUXILIARY TESTS ***"
+	@echo "localauth: tests to see if localauth exists or not and run"
+	@echo "           appropriate tests"
 	@echo "*** A HELPFUL DEPENDENCY ***"
 	@echo "alwaysrun: blank target that is a dependency for targets"
 	@echo "           that should \"always run\""
@@ -326,7 +333,7 @@ vanillatar:
 	chmod a+rx $(SOURCE)/TEST
 	chmod a+rx $(SOURCE)/CHECKRPMS
 	# -------------------------------- Copy README to the vanilla top-level
-	cp -v $(SOURCE)/doc/shortest_path_redhat7.2.txt $(SOURCE)/README
+	#cp -v $(SOURCE)/doc/shortest_path_redhat7.2.txt $(SOURCE)/README
 
 tardist:
 	make MANIFEST_all
@@ -470,6 +477,8 @@ MANIFEST_all:
 	echo 'loncom/rawhide_hosts.tab' >> $(SOURCE)/MANIFEST
 	echo 'loncom/production_hosts.tab' >> $(SOURCE)/MANIFEST
 	echo 'loncom/development_hosts.tab' >> $(SOURCE)/MANIFEST
+	echo 'loncom/production_domain.tab' >> $(SOURCE)/MANIFEST
+	echo 'loncom/development_domain.tab' >> $(SOURCE)/MANIFEST
 	# ------------------ Files needed for dynamically generated directories
 	echo 'doc/man' >> $(SOURCE)/MANIFEST
 	echo 'doc/lib' >> $(SOURCE)/MANIFEST
@@ -500,6 +509,9 @@ MANIFEST_lpml:
 	cat $(SOURCE)/doc/loncapafiles/testfiles.lpml | \
 	perl lpml_parse.pl MANIFEST development default \
 	'$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' >> $(SOURCE)/MANIFEST
+	cat $(SOURCE)/doc/loncapafiles/installfiles.lpml | \
+	perl lpml_parse.pl MANIFEST development default \
+	'$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' >> $(SOURCE)/MANIFEST
 	cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \
 	perl lpml_parse.pl MANIFEST development default \
 	'$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' >> $(SOURCE)/MANIFEST
@@ -568,8 +580,8 @@ RPM: BinaryRoot base_rpm_file_list
 	cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \
 	perl lpml_parse.pl make_rpm $(CATEGORY) $(DIST) $(SOURCE) $(TARGET) \
 	> base_customizerpm.xml
-	cat base_rpm_file_list.txt | perl make_rpm.pl base 3.2 '' '' \
-	BinaryRoot base_customizerpm.xml
+	cat base_rpm_file_list.txt | perl make_rpm.pl base $(VERSION) \
+	$(RELEASE) '' '' BinaryRoot base_customizerpm.xml
 
 DPKG:
 	make TARGET='lon-capa-$(VERSION)' NORESTORECONF='1' install
@@ -782,5 +794,20 @@ backup:
 restore:
 	@echo "Not yet implemented"
 
+# ===================================================== *** AUXILIARY TESTS ***
+localauth:
+	@if (test -e $(LOCALAUTHPATH)/localauth.pm) && \
+             !(diff $(LOCALAUTHPATH)/localauth-std.pm \
+              $(LOCALAUTHPATH)/localauth.pm > /dev/null); then \
+		echo "**** WARNING **** $(LOCALAUTHPATH)/localauth.pm is different than the $(LOCALAUTHPATH)/localauth-std.pm; if you have not customized localauth.pm, then please manually overwrite localauth.pm (rm $(LOCALAUTHPATH)/localauth.pm; ln -s $(LOCALAUTHPATH)/localauth-std.pm $(LOCALAUTHPATH)/localauth.pm); if you have customized localauth.pm, then please double-check to see that your customized localauth.pm is compatible with any localauth-std.pm changes for this version of LON-CAPA"| tee -a WARNINGS; \
+	elif (test -e $(LOCALAUTHPATH)/localauth.pm) && \
+              (diff $(LOCALAUTHPATH)/localauth-std.pm \
+              $(LOCALAUTHPATH)/localauth.pm > /dev/null); then \
+		echo "**** NOTE **** LOCAL AUTH IS IDENTICAL WITH STANDARD TEMPLATE"| tee -a WARNINGS; \
+	elif !(test -e $(LOCALAUTHPATH)/localauth.pm) && \
+	      (test -e $(LOCALAUTHPATH)/localauth-std.pm); then \
+		ln -s $(LOCALAUTHPATH)/localauth-std.pm $(LOCALAUTHPATH)/localauth.pm; \
+	fi
+
 # ================================================ *** A HELPFUL DEPENDENCY ***
 alwaysrun: