--- loncom/build/Makefile 2003/01/13 00:17:24 1.140
+++ loncom/build/Makefile 2003/02/03 18:03:52 1.144
@@ -1,7 +1,6 @@
# The LearningOnline Network with CAPA
-# Scott Harrison, your friendly neighborhood volunteer
-# $Id: Makefile,v 1.140 2003/01/13 00:17:24 harris41 Exp $
+# $Id: Makefile,v 1.144 2003/02/03 18:03:52 harris41 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.6
+VERSION=0.6.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\""
@@ -571,8 +578,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 $(VERSION) 1 '' '' \
- 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
@@ -785,5 +792,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:
500 Internal Server Error
Internal Server Error
The server encountered an internal error or
misconfiguration and was unable to complete
your request.
Please contact the server administrator at
root@localhost to inform them of the time this error occurred,
and the actions you performed just before this error.
More information about this error may be available
in the server error log.