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

harris41 lon-capa-cvs@mail.lon-capa.org
Tue, 23 Jul 2002 22:17:23 -0000


This is a MIME encoded message

--harris411027462643
Content-Type: text/plain

harris41		Tue Jul 23 18:17:23 2002 EDT

  Modified files:              
    /loncom/build	Makefile 
  Log:
  adding semaphore to tell user to 'make build' before 'make install';
  fixing help targets; reshuffling targets into a more logical order;
  clearly documenting sections involving multiple targets
  
  
--harris411027462643
Content-Type: text/plain
Content-Disposition: attachment; filename="harris41-20020723181723.txt"

Index: loncom/build/Makefile
diff -u loncom/build/Makefile:1.128 loncom/build/Makefile:1.129
--- loncom/build/Makefile:1.128	Fri Jul 19 14:54:41 2002
+++ loncom/build/Makefile	Tue Jul 23 18:17:22 2002
@@ -1,8 +1,14 @@
 # The LearningOnline Network with CAPA
 
-# Scott Harrison
-# $Id: Makefile,v 1.128 2002/07/19 18:54:41 harris41 Exp $
+# Scott Harrison, your friendly neighborhood volunteer
+# $Id: Makefile,v 1.129 2002/07/23 22:17:22 harris41 Exp $
 
+# TYPICAL USAGE of this Makefile is primarily for two targets:
+# "make build" and "make install".
+# Many other targets and features are supported (see the initial
+# help targets).
+
+# ======================================= Default settings for Makefile options
 DISTPROBE=`perl ./distprobe`
 DIST=$(DISTPROBE)
 CATEGORY="development"
@@ -20,43 +26,169 @@
 VERSION=0.4
 DIRTARGET=loncapa-$(VERSION)
 
+# =============================================== Help targets for the Makefile
+# If 'make' is run without any arguments, the 'help' target is called since
+# it is the first target.
 help:
 	@echo "*** You need to specify a valid target ***"
-	@echo "NOTE: You can specify options to your Makefile target."
+	@echo "To get a list of valid targets: \"make help_TARGETS\""
+	@echo "To get a list of valid options: \"make help_OPTIONS\""
+	@echo " "
+	@echo "Typically invoked targets are:"
+	@echo "    make build"
+	@echo "    make install"
+	@echo "    make test"
+	@echo "    make clean"
+
+help_OPTIONS:
+	@echo "* ADJUSTABLE OPTIONS *"
 	@echo "(option) DIST can be redhat7, debian, redhat6.2, or default"
-	@echo "(option) CATEGORY can be runtime or development"
-	@echo "(option) SOURCE is an absolute or relative directory path"
-	@echo "(option) TARGET is an absolute or relative directory path"
-	@echo "build: compile the CVS source tree"
-	@echo "install: install from a compiled CVS source tree to a "
-	@echo "         specified TARGET destination on the filesystem"
-	@echo "test: test different parts of the LON-CAPA system (TEST_*)"
-	@echo "TEST_lpml_scripts: make sure that the system can process "
-	@echo "                   the Linux Packaging Markup Language"
+	@echo "         You probably do not need to specify this; it is"
+	@echo "         automatically probed for."
+	@echo "(option) CATEGORY can be 'runtime' or 'development'; currently"
+	@echo "         the 'development' setting is the most reliable;"
+	@echo "         eventually, production machines should be using the"
+	@echo "         'runtime' settings"
+	@echo "(option) SOURCE is an absolute or relative directory path."
+	@echo "         SOURCE corresponds to the root directory of the"
+	@echo "         loncapa source release"
+	@echo "(option) TARGET is an absolute or relative directory path."
+	@echo "         This is where files will be installed on your system."
+	@echo "         Typically, this should be set to nothing (which"
+	@echo "         corresponds to the '/' root of the entire filesystem)."
+	@echo "(option) NORESTORECONF, when set to a non-zero value, stops"
+	@echo "         filesystem upgrades from overwriting existing "
+	@echo "         configuration files.  Ordinarily, NORESTORECONF=0, "
+	@echo "         because the existing configuration files are safely"
+	@echo "         dealt with (or so one hopes... :) )."
+	@echo "(option) HOSTNAME specifies the name of a remote server for"
+	@echo "         which a NET_* Makefile target should be launched"
+	@echo "(option) VERSION; especially useful for the 'tardist' target"
+	@echo "         this tags the tarball file and internal directories"
+	@echo "         with a specific version string (conventionally "
+	@echo "         numeric)"
+
+help_TARGETS:
+	@echo "*** RUNNING TESTS TO ENSURE SOLID PERFORMANCE ***"
+	@echo "test: test different parts of the LON-CAPA system (TEST_*)."
+	@echo "      Makefile-dependent processes as well as horizontal and"
+	@echo "      vertical aspects of the LON-CAPA system architecture"
+	@echo "      are all tested."
+	@echo "TEST_lpml_scripts: make sure that the system can process"
+	@echo "                   the Linux Packaging Markup Language."
+	@echo "                   This is neither horizontal or vertical"
+	@echo "                   testing.  The idea is to make sure that"
+	@echo "                   the installation software itself works"
+	@echo "                   as expected."
 	@echo "TEST_system_dependencies: make sure that all needed system "
 	@echo "                          components are active and present "
 	@echo "                          on the server such as perl modules"
 	@echo "                          and the MySQL database"
-	@echo "TEST_web_layer: mimic a login and various system actions on "
+	@echo "                          (horizontal testing)"
+	@echo "TEST_web_layer: mimic a login and various vertical actions on "
 	@echo "                a LON-CAPA system"
+	@echo "TEST_hosts_tab: make sure that a loncapa/loncom/hosts.tab"
+	@echo "                file is specified for installation"
+	@echo "TEST_html2ps: test for the presence of html2ps which is needed"
+	@echo "              for making a PDF compilation for pdfdoc"
+	@echo "*** GENERAL TARGETS SUCH AS 'build' AND 'install' ***"
+	@echo "build: compile the source tree"
+	@echo "buildflag: a semaphore that helps educate the user to run"
+	@echo "           'make build' first before running 'make install'"
+	@echo "configinstall: install configuration files and restore with"
+	@echo "               prior information"
+	@echo "install: install from a ***compiled*** source tree
+	@echo "         (see make build) to a specified TARGET destination"
+	@echo "         on the filesystem (default setting is TARGET=/)."
+	@echo "rawinstall: just install files, links and directories without"
+	@echo "            any bells or whistles (e.g. double-checking"
+	@echo "            configurations, fine-tuning webserver, etc.)"
+	@echo "hosts_tab: install the hosts.tab to the filesystem"
+	@echo "webserverconf: fine-tune the web server configuration;"
+	@echo "               make sure the proper 'Include' statements"
+	@echo "               are appended to httpd.conf"
+	@echo "vanillatar: generate top-level files such as README, UPDATE,"
+	@echo "            CHECKRPMS, and TEST (needed by tardist)"
+	@echo "tardist: build a tarball that will upgrade the software on a "
+	@echo "         system"
+	@echo "sanitycheck: probe for common errors and recommend fixes to"
+	@echo "             the user"
+	@echo "updatequery: solicit the user for machine configuration"
+	@echo "             information; to be incorporated during an update"
+	@echo "             procedure (via the UPDATE command)"
+	@echo "postinstall: double-check things after installation"
+	@echo "VERSION: tag the filesystem with version information inside"
+	@echo "         /etc/loncapa-release"
+	@echo "aboutVERSION: place version information inside about.html"
+	@echo "*** Makefile.* TARGETS BUILT DYNAMICALLY FROM loncapafiles.lpml ***"
+	@echo "Makefile.configinstall: generate a Makefile for configuration"
+	@echo "                        files; built dynamically from"
+	@echo "                        loncapafiles.lpml"
+	@echo "Makefile.build: generate a Makefile for compiling"
+	@echo "                files inside the source directory; "
+	@echo "                Makefile.build is generated from"
+	@echo "                loncapafiles.lpml"
+	@echo "Makefile.install: generate a Makefile for installing"
+	@echo "                  files; built dynamically from"
+	@echo "                  loncapafiles.lpml"
+	@echo "*** TARGETS FOR OPERATING ON FILESYSTEMS ACROSS THE NETWORK ***"
+	@echo "lpmladm: coordinates username=lpmladm mediated secure shell"
+	@echo "         processes; needed for the NET_* targets"
+	@echo "NET_hosts_tab: install the hosts.tab to a filesystem elsewhere"
+	@echo "               on the network"
+	@echo "NET_webserverconf: fine-tune the web server configuration on a"
+	@echo "                   filesystem elsewhere on the network"
+	@echo "NET_rawinstall: launch the rawinstall target on a filesystem"
+	@echo "                elsewhere on the network"
+	@echo "*** TARGETS FOR MAKING LISTS (MANIFESTS) OF LON-CAPA FILES ***"
+	@echo "MANIFEST_all: generate a list of all files to be included in"
+	@echo "              the distributed tarball"
+	@echo "MANIFEST_cvs: essentially a list of all CVS/Entries files used"
+	@echo "              for 'time-checking' intelligence"
+	@echo "MANIFEST_lpml: a list of all LON-CAPA files to be installed,
+	@echo "               compile from, used as building software, and"
+	@echo "               testing"
+	@echo "MANIFEST_vanillatar: 'README'-type top-level files that a user"
+	@echo "                     of the distributed tarball would first"
+	@echo "                     look at and work with"
+	@echo "*** STATUS REPORT TARGETS ***"
+	@echo "warningnote: analyze the WARNINGS file and produce a synopsis"
+	@echo "             and recommended action to the user"
 	@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 "status: compare the TARGET filesystem with a compiled CVS "
+	@echo "      source files"
+	@echo "status: compare the TARGET filesystem with a compiled loncapa "
 	@echo "        source directory"
 	@echo "statuspost: post the results of "make status" to "
 	@echo "            TARGET/home/httpd/html/lon-status/filestatus.html"
 	@echo "rpmstatus: compare the rpms on a system to defined lists "
-	@echo "           CVS:doc/otherfiles/cd_rpms and "
-	@echo "           CVS:doc/otherfiles/rpm_list.txt"
-	@echo "rpmstatuspost: post the results of "make rpmstatus" to "
+	@echo "           loncapa/doc/otherfiles/cd_rpms and "
+	@echo "           loncapa/doc/otherfiles/rpm_list.txt"
+	@echo "rpmstatuspost: post the results of 'make rpmstatus' to "
 	@echo "            TARGET/home/httpd/html/lon-status/rpmstatus.html"
-	@echo "RPM: build LON-CAPA-base RPM from CVS repository"
-	@echo "setup_RPM: build LON-CAPA-setup RPM from CVS repository"
-	@echo "           handy for CD-ROM generation"
-	@echo "tardist: build a tarball that will upgrade the software on a "
-	@echo "         system"
+	@echo "*** ALTERNATIVE PACKAGING TARGETS ***"
+	@echo "RPM: build LON-CAPA-base RPM from loncapa source repository"
+	@echo "     (still under development)"
+	@echo "DPKG: build a loncapa Debian package from loncapa source"
+	@echo "      repository (still under development)"
+	@echo "base_rpm_file_list: create a file listing to be used for"
+	@echo "                    generating an RPM software package"
+	@echo "BinaryRoot: create a BinaryRoot directory to be used for"
+	@echo "            generating an RPM software package"
+	@echo "*** MASTER DOCUMENTATION TARGETS ***"	
+	@echo "doc: generate web-page documentation for install.lon-capa.org"
+	@echo "     (and eventually for documentation on installed machines)"
+	@echo "pdfdoc: make a PDF-formatted compilation of all installation"
+	@echo "        documentation"
+	@echo "*** KEEPING THINGS CLEAN ***"
+	@echo "clean: remove any files that might (even by remote chance)"
+	@echo "       interfere with rebuilding/recompiling software"
+	@echo "reallyclean: remove all files that were generated during"
+	@echo "             building or compilation of the software"
+	@echo "*** A HELPFUL DEPENDENCY ***"
+	@echo "alwaysrun: blank target that is a dependency for targets"
+	@echo "           that should \"always run\""
+
+# =========================== *** RUNNING TESTS TO ENSURE SOLID PERFORMANCE ***
 
 test: TEST_lpml_scripts TEST_system_dependencies TEST_web_layer
 	@echo "ALL SYSTEM DEPENDENCY TESTS SUCCESSFUL"
@@ -76,7 +208,7 @@
 TEST_hosts_tab:
 	@echo "Testing hosts.tab"
 	@if (test -e ../hosts.tab); then \
-		echo "there is a defined link; assume okay"; \
+		echo "there is a defined link or file; assume okay"; \
 	else echo "**** ERROR **** hosts.tab not defined!" && \
 	     echo -n "You need to do one of the following within your " && \
 	     echo "CVS repository (cd loncapa/loncom)" && \
@@ -87,9 +219,61 @@
 	     exit 1; \
 	fi
 
-NET_hosts_tab:
-	make TIMESTAMP=`date +"%s"` METAMTARGET="TRANSPORT" \
-	MTARGET="hosts_tab" HOSTNAME="$(HOSTNAME)" lpmladm
+TEST_html2ps:
+	@if (test -e /usr/local/html2ps/bin/html2ps); then \
+		echo "I can find html2ps; assume okay"; \
+	else \
+	echo "**** ERROR **** cannot find /usr/local/html2ps/bin/html2ps!" && \
+        echo "Please visit http://www.tdb.uu.se/~jan/html2ps.html" && \
+	exit 1; \
+	fi
+
+# ======================= *** GENERAL TARGETS SUCH AS 'build' AND 'install' ***
+
+build: Makefile.build pod2html.sh pod2man.sh
+	install -d $(SOURCE)/doc/man
+	install -d $(SOURCE)/doc/scripts
+	install -d $(SOURCE)/doc/lib/perl/Apache
+	echo -n "" > WARNINGS
+	make -f Makefile.build all
+	echo '1' > buildflag
+	make warningnote
+
+buildflag:
+	@echo "**** ERROR **** You need to run 'make build' first" > WARNINGS
+	make warningnote
+	@need_to_run_make_build_first 2>/dev/null
+
+configinstall: Makefile.configinstall
+	make -f Makefile.configinstall SOURCE="$(SOURCE)" TARGET="$(TARGET)" \
+	configfiles
+	if (test "0" = $(NORESTORECONF)); then \
+	perl loncaparestoreconfigurations suffix .lpmlnew; fi
+
+install: buildflag VERSION TEST_hosts_tab Makefile.install Makefile
+	echo -n "" > WARNINGS
+	make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" \
+	directories
+	make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" files
+	make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" links
+	make SOURCE="$(SOURCE)" TARGET="$(TARGET)" \
+	NORESTORECONF="$(NORESTORECONF)" configinstall
+	make postinstall
+	make warningnote
+	echo "You can run 'make test' to see if your system is ready to go!"
+	echo "NOTE THAT YOUR SYSTEM MUST HAVE MYSQL WITH A USER=\"www\" AND"
+	echo -n "PASSWORD=\"localhostkey\" FOR www\@localhost"
+	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: VERSION Makefile.install Makefile
+	echo -n "" > WARNINGS
+	make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" \
+	directories
+	make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" files
+	make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" links
+	make SOURCE="$(SOURCE)" TARGET="$(TARGET)" \
+	NORESTORECONF="$(NORESTORECONF)" configinstall
 
 hosts_tab: TEST_hosts_tab
 	cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \
@@ -102,6 +286,104 @@
 	@echo "   /etc/rc.d/init.d/httpd restart"
 	@echo "   /etc/rc.d/init.d/loncontrol restart"
 
+webserverconf:
+	cat $(SOURCE)/doc/loncapafiles/webserver.piml | \
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH)
+
+# ---------------- Top-level files such as README, UPDATE, CHECKRPMS, and TEST
+vanillatar:
+	# --------------------------- Point UPDATE to the internal make process
+	echo '#!/bin/sh' > $(SOURCE)/UPDATE
+	echo 'touch loncom/build/WARNINGS' >> $(SOURCE)/UPDATE;
+	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
+	echo 'cd loncom/build; make test' >> $(SOURCE)/TEST
+	# ----------------------------- Copy CHECKRPMS to the vanilla top-level
+	cp -v $(SOURCE)/loncom/build/CHECKRPMS $(SOURCE)/CHECKRPMS
+	# ----------------------- vanilla executables must indeed be executable
+	chmod a+rx $(SOURCE)/UPDATE
+	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
+
+tardist:
+	make MANIFEST_all
+	make vanillatar
+	# -------------------------------------------------------- Make tardist
+	@cd $(SOURCE); \
+	if (test -h $(DIRTARGET)); then \
+		echo "$(DIRTARGET) link already defined; assume okay"; \
+	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 \
+	-h -czf $(DIRTARGET).tar.gz 2>tar_WARNINGS || [ "0" == "0" ]
+	mv -v $(SOURCE)/loncom/license/about.html.orig \
+	$(SOURCE)/loncom/license/about.html
+	cat $(SOURCE)/tar_WARNINGS | \
+	xargs --replace=XXX echo '**** WARNING **** XXX' > WARNINGS
+	rm -f $(SOURCE)/tar_WARNINGS
+	make warningnote
+
+sanitycheck:
+	cat $(SOURCE)/doc/loncapafiles/sanitycheck.piml | \
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
+
+updatequery:
+	cat $(SOURCE)/doc/loncapafiles/updatequery.piml | \
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(QUERYLAUNCH)
+
+postinstall:
+	make webserverconf
+	make sanitycheck
+
+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
+
+# ========= *** Makefile.* TARGETS BUILT DYNAMICALLY FROM loncapafiles.lpml ***
+
+Makefile.configinstall: $(SOURCE)/doc/loncapafiles/loncapafiles.lpml \
+                        lpml_parse.pl
+	cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \
+	perl lpml_parse.pl configinstall $(CATEGORY) $(DIST) "$(SOURCE)" \
+	"$(TARGET)" > Makefile.configinstall
+
+Makefile.build: $(SOURCE)/doc/loncapafiles/loncapafiles.lpml lpml_parse.pl
+	cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \
+	perl lpml_parse.pl build $(CATEGORY) $(DIST) "$(SOURCE)" "$(TARGET)" \
+	> Makefile.build
+
+Makefile.install: alwaysrun
+	cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \
+	perl lpml_parse.pl install $(CATEGORY) $(DIST) "$(SOURCE)" \
+	"$(TARGET)" > Makefile.install
+
+# ============= *** TARGETS FOR OPERATING ON FILESYSTEMS ACROSS THE NETWORK ***
+
 lpmladm:
 	@if (test $(METAMTARGET) = "TRANSPORT"); then \
 		echo "Transporting to $(HOSTNAME)"; \
@@ -132,6 +414,90 @@
 		echo "**** ERROR **** Incorrect METAMTARGET"; \
 	fi
 
+NET_hosts_tab:
+	make TIMESTAMP=`date +"%s"` METAMTARGET="TRANSPORT" \
+	MTARGET="hosts_tab" HOSTNAME="$(HOSTNAME)" lpmladm
+
+NET_webserverconf:
+	make TIMESTAMP=`date +"%s"` METAMTARGET="LAUNCH" \
+	MTARGET="webserverconf" HOSTNAME="$(HOSTNAME)" lpmladm
+
+NET_rawinstall:
+	make TIMESTAMP=`date +"%s"` METAMTARGET="TRANSPORT" \
+	MTARGET="rawinstall" HOSTNAME="$(HOSTNAME)" lpmladm
+
+# ============== *** TARGETS FOR MAKING LISTS (MANIFESTS) OF LON-CAPA FILES ***
+
+MANIFEST_all:
+	# --------------------------------------------------------- start clean
+	rm -f $(SOURCE)/MANIFEST
+	make MANIFEST_lpml
+	make MANIFEST_vanillatar
+	make MANIFEST_cvs
+	# ---------------------------------- might as well include the MANIFEST
+	echo 'MANIFEST' >> $(SOURCE)/MANIFEST
+	# ------------------------------------------ hosts.tab are belong to us
+	echo 'loncom/rawhide_hosts.tab' >> $(SOURCE)/MANIFEST
+	echo 'loncom/production_hosts.tab' >> $(SOURCE)/MANIFEST
+	echo 'loncom/development_hosts.tab' >> $(SOURCE)/MANIFEST
+	# ------------------ Files needed for dynamically generated directories
+	echo 'doc/man' >> $(SOURCE)/MANIFEST
+	echo 'doc/lib' >> $(SOURCE)/MANIFEST
+	echo 'doc/lib/perl' >> $(SOURCE)/MANIFEST
+	echo 'doc/lib/perl/Apache' >> $(SOURCE)/MANIFEST
+	echo 'doc/scripts' >> $(SOURCE)/MANIFEST
+	# --------------------------------------------------- Clean up MANIFEST
+	cd $(SOURCE); \
+	sort MANIFEST | perl -nle 'print "$(DIRTARGET)/$$_"' | \
+	perl -nle 's/\w+\/\.\.\///g;s/\w+\/\.\.\///g;print' | \
+	perl -nle 's/\w+\/\.\.\///g;s/\w+\/\.\.\///g;print' | \
+	perl -nle 's/\w+\/\.\.\///g;s/\w+\/\.\.\///g;print' | \
+	perl -nle 's/\/\.\//\//g;print' | sort | uniq > \
+	MANIFEST_loncapa
+	cd $(SOURCE); mv -v MANIFEST_loncapa MANIFEST
+
+# --------------- MANIFEST files with important CVS versioning/date information
+MANIFEST_cvs:
+	# ------ CVS/Entries directories to retain 'time-checking' intelligence
+	cd $(SOURCE); find . -type f -name 'Entries' | grep 'CVS/Entries' >> \
+	MANIFEST
+
+# ------------------- MANIFEST the building, testing and standard loncapa files
+MANIFEST_lpml:
+	cat $(SOURCE)/doc/loncapafiles/buildfiles.lpml | \
+	perl lpml_parse.pl MANIFEST development default \
+	'$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' >> $(SOURCE)/MANIFEST
+	cat $(SOURCE)/doc/loncapafiles/testfiles.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
+
+# ------------ Files for top-level (the vanilla layer that the user first sees)
+MANIFEST_vanillatar:
+	echo 'README' >> $(SOURCE)/MANIFEST
+	echo 'UPDATE' >> $(SOURCE)/MANIFEST
+	echo 'TEST' >> $(SOURCE)/MANIFEST
+	echo 'CHECKRPMS' >> $(SOURCE)/MANIFEST
+
+# =============================================== *** STATUS REPORT TARGETS ***
+
+warningnote:
+	@if (test -s WARNINGS); then \
+		W=`grep -c '\*\*\*\* WARNING' WARNINGS`; \
+		E=`grep -c '\*\*\*\* ERROR' WARNINGS`; \
+		N=`grep -c '\*\*\*\* NOTE' WARNINGS`; \
+		echo "--->  $$W WARNINGS ENCOUNTERED!       "; \
+		echo "--->  $$E ERRORS ENCOUNTERED!         "; \
+		echo "--->  $$N NOTES ENCOUNTERED!          "; \
+		echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"; \
+		echo "!!!!  Please read the WARNINGS file !!!!"; \
+		echo "!!!!   to make sure everything is   !!!!"; \
+		echo "!!!!    correct and taken care of   !!!!"; \
+		echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"; \
+	fi
+
 HTML:
 	install -d HTML
 	cp $(SOURCE)/doc/loncapafiles/*.gif HTML
@@ -166,111 +532,7 @@
 rpmstatuspost: rpmstatus
 	cp RPMSTATUS/rpmstatus.html /home/httpd/html/lon-status/rpmstatus.html
 
-configinstall: Makefile.configinstall
-	make -f Makefile.configinstall SOURCE="$(SOURCE)" TARGET="$(TARGET)" \
-	configfiles
-	if (test "0" = $(NORESTORECONF)); then \
-	perl loncaparestoreconfigurations suffix .lpmlnew; fi
-
-Makefile.configinstall: $(SOURCE)/doc/loncapafiles/loncapafiles.lpml lpml_parse.pl
-	cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \
-	perl lpml_parse.pl configinstall $(CATEGORY) $(DIST) "$(SOURCE)" \
-	"$(TARGET)" > Makefile.configinstall
-
-warningnote:
-	@if (test -s WARNINGS); then \
-		W=`grep -c '\*\*\*\* WARNING' WARNINGS`; \
-		E=`grep -c '\*\*\*\* ERROR' WARNINGS`; \
-		N=`grep -c '\*\*\*\* NOTE' WARNINGS`; \
-		echo "--->  $$W WARNINGS ENCOUNTERED!       "; \
-		echo "--->  $$E ERRORS ENCOUNTERED!         "; \
-		echo "--->  $$N NOTES ENCOUNTERED!          "; \
-		echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"; \
-		echo "!!!!  Please read the WARNINGS file !!!!"; \
-		echo "!!!!   to make sure everything is   !!!!"; \
-		echo "!!!!    correct and taken care of   !!!!"; \
-		echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"; \
-	fi
-
-NET_webserverconf:
-	make TIMESTAMP=`date +"%s"` METAMTARGET="LAUNCH" \
-	MTARGET="webserverconf" HOSTNAME="$(HOSTNAME)" lpmladm
-
-webserverconf:
-	cat $(SOURCE)/doc/loncapafiles/webserver.piml | \
-	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH)
-
-sanitycheck:
-	cat $(SOURCE)/doc/loncapafiles/sanitycheck.piml | \
-	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
-	tee -a WARNINGS
-
-updatequery:
-	cat $(SOURCE)/doc/loncapafiles/updatequery.piml | \
-	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(QUERYLAUNCH)
-
-postinstall:
-	make webserverconf
-	make sanitycheck
-
-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
-	make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" files
-	make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" links
-	make SOURCE="$(SOURCE)" TARGET="$(TARGET)" \
-	NORESTORECONF="$(NORESTORECONF)" configinstall
-	make postinstall
-	make warningnote
-	echo "You can run 'make test' to see if your system is ready to go!"
-	echo "NOTE THAT YOUR SYSTEM MUST HAVE MYSQL WITH A USER=\"www\" AND"
-	echo -n "PASSWORD=\"localhostkey\" FOR www\@localhost"
-	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: VERSION Makefile.install Makefile
-	echo -n "" > WARNINGS
-	make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" \
-	directories
-	make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" files
-	make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" links
-	make SOURCE="$(SOURCE)" TARGET="$(TARGET)" \
-	NORESTORECONF="$(NORESTORECONF)" configinstall
-
-Makefile.install: alwaysrun
-	cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \
-	perl lpml_parse.pl install $(CATEGORY) $(DIST) "$(SOURCE)" \
-	"$(TARGET)" > Makefile.install
-
-build: Makefile.build pod2html.sh pod2man.sh
-	install -d $(SOURCE)/doc/man
-	install -d $(SOURCE)/doc/scripts
-	install -d $(SOURCE)/doc/lib/perl/Apache
-	echo -n "" > WARNINGS
-	make -f Makefile.build all
-	make warningnote
-
-Makefile.build: $(SOURCE)/doc/loncapafiles/loncapafiles.lpml lpml_parse.pl
-	cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \
-	perl lpml_parse.pl build $(CATEGORY) $(DIST) "$(SOURCE)" "$(TARGET)" \
-	> Makefile.build
+# ======================================= *** ALTERNATIVE PACKAGING TARGETS ***
 
 RPM: BinaryRoot base_rpm_file_list
 	cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \
@@ -279,17 +541,6 @@
 	cat base_rpm_file_list.txt | perl make_rpm.pl base 3.2 '' '' \
 	BinaryRoot base_customizerpm.xml
 
-setup_RPM:
-	echo "SetupBinaryRoot/etc/passwd" > setup_rpm_file_list.txt
-	echo "SetupBinaryRoot/etc/group" >> setup_rpm_file_list.txt
-	echo "SetupBinaryRoot/etc/hosts.deny" >> setup_rpm_file_list.txt
-	echo "SetupBinaryRoot/home/www" >> setup_rpm_file_list.txt
-	echo "SetupBinaryRoot/etc/pam.d/passwd" >> setup_rpm_file_list.txt
-	echo "SetupBinaryRoot/etc/pam.d/login" >> setup_rpm_file_list.txt
-	perl setup_rpm_binaryroot.pl
-	cat setup_rpm_file_list.txt | perl make_rpm.pl setup 3.2 '' '' \
-	SetupBinaryRoot customizerpm.xml
-
 DPKG:
 	make TARGET='lon-capa-$(VERSION)' NORESTORECONF='1' install
 	@echo "You will next need to follow instructions at:"
@@ -316,6 +567,8 @@
 BinaryRoot: base_rpm_file_list
 	make TARGET='BinaryRoot' NORESTORECONF='1' install
 
+# ======================================== *** MASTER DOCUMENTATION TARGETS ***
+
 # Generates CVS:loncom/build/docs; root location of install.lon-capa.org
 doc:
 	install -d docs
@@ -391,7 +644,8 @@
 #	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' | grep -v 'keyword' | 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
@@ -427,98 +681,10 @@
 	ps2pdf pdfdoc/installation_manual.ps pdfdoc/installation_manual.pdf
 	mv -vf pdfdoc/installation_manual.pdf .
 
-TEST_html2ps:
-	@if (test -e /usr/local/html2ps/bin/html2ps); then \
-		echo "I can find html2ps; assume okay"; \
-	else \
-	echo "**** ERROR **** cannot find /usr/local/html2ps/bin/html2ps!" && \
-        echo "Please visit http://www.tdb.uu.se/~jan/html2ps.html" && \
-	exit 1; \
-	fi
-
-tardist:
-	# ----------- MANIFEST the building, testing and standard loncapa files
-	cat $(SOURCE)/doc/loncapafiles/buildfiles.lpml | \
-	perl lpml_parse.pl MANIFEST development default \
-	'$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' > $(SOURCE)/MANIFEST
-	cat $(SOURCE)/doc/loncapafiles/testfiles.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
-	# ------ CVS/Entries directories to retain 'time-checking' intelligence
-	cd $(SOURCE); find . -type f -name 'Entries' | grep 'CVS/Entries' >> \
-	MANIFEST
-	# ---- Files for top-level (the vanilla layer that the user first sees)
-	echo 'README' >> $(SOURCE)/MANIFEST
-	echo 'UPDATE' >> $(SOURCE)/MANIFEST
-	echo 'TEST' >> $(SOURCE)/MANIFEST
-	echo 'CHECKRPMS' >> $(SOURCE)/MANIFEST
-	# ---------------------------------- might as well include the MANIFEST
-	echo 'MANIFEST' >> $(SOURCE)/MANIFEST
-	# ------------------------------------------ hosts.tab are belong to us
-	echo 'loncom/rawhide_hosts.tab' >> $(SOURCE)/MANIFEST
-	echo 'loncom/production_hosts.tab' >> $(SOURCE)/MANIFEST
-	echo 'loncom/development_hosts.tab' >> $(SOURCE)/MANIFEST
-	# ------------------ Files needed for dynamically generated directories
-	echo 'doc/man' >> $(SOURCE)/MANIFEST
-	echo 'doc/lib' >> $(SOURCE)/MANIFEST
-	echo 'doc/lib/perl' >> $(SOURCE)/MANIFEST
-	echo 'doc/lib/perl/Apache' >> $(SOURCE)/MANIFEST
-	echo 'doc/scripts' >> $(SOURCE)/MANIFEST
-	# --------------------------- Point UPDATE to the internal make process
-	echo '#!/bin/sh' > $(SOURCE)/UPDATE
-	echo 'touch loncom/build/WARNINGS' >> $(SOURCE)/UPDATE;
-	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
-	echo 'cd loncom/build; make test' >> $(SOURCE)/TEST
-	# ----------------------------- Copy CHECKRPMS to the vanilla top-level
-	cp $(SOURCE)/loncom/build/CHECKRPMS $(SOURCE)/CHECKRPMS
-	# ----------------------- vanilla executables must indeed be executable
-	chmod a+rx $(SOURCE)/UPDATE
-	chmod a+rx $(SOURCE)/TEST
-	chmod a+rx $(SOURCE)/CHECKRPMS
-	# -------------------------------- Copy README to the vanilla top-level
-	cp $(SOURCE)/doc/shortest_path_redhat7.2.txt $(SOURCE)/README
-	# --------------------------------------------------- Clean up MANIFEST
-	cd $(SOURCE); \
-	sort MANIFEST | perl -nle 'print "$(DIRTARGET)/$$_"' | \
-	perl -nle 's/\w+\/\.\.\///g;s/\w+\/\.\.\///g;print' | \
-	perl -nle 's/\w+\/\.\.\///g;s/\w+\/\.\.\///g;print' | \
-	perl -nle 's/\w+\/\.\.\///g;s/\w+\/\.\.\///g;print' | \
-	perl -nle 's/\/\.\//\//g;print' | sort | uniq > \
-	MANIFEST_loncapa
-	# -------------------------------------------------------- Make tardist
-	@cd $(SOURCE); \
-	if (test -h $(DIRTARGET)); then \
-		echo "$(DIRTARGET) link already defined; assume okay"; \
-	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 $(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
-	make warningnote
+# ================================================ *** KEEPING THINGS CLEAN ***
 
 clean:
+	rm -f buildflag
 	rm -Rf HTML
 	rm -f installation_manual.pdf
 	rm -f Makefile.build
@@ -539,10 +705,12 @@
 	rm -f $(SOURCE)/loncom/build/hosts.tab
 
 reallyclean:
+	rm -f buildflag
 	rm -f $(SOURCE)/README
 	rm -f $(SOURCE)/UPDATE
 	rm -f $(SOURCE)/TEST
 	rm -f $(SOURCE)/MANIFEST
+	rm -f $(SOURCE)/MANIFEST_loncapa
 	rm -f $(SOURCE)/loncapa
 	rm -f $(SOURCE)/loncom/build/hosts.tab
 	rm -f $(SOURCE)/loncapa.tar.gz
@@ -565,4 +733,5 @@
 	make -f Makefile.cvs clean
 	rm -f WARNINGS
 
+# ================================================ *** A HELPFUL DEPENDENCY ***
 alwaysrun:

--harris411027462643--