--- loncom/build/Makefile 2002/09/05 21:08:55 1.130.2.3 +++ loncom/build/Makefile 2002/08/14 18:31:43 1.132 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Scott Harrison, your friendly neighborhood volunteer -# $Id: Makefile,v 1.130.2.3 2002/09/05 21:08:55 albertel Exp $ +# $Id: Makefile,v 1.132 2002/08/14 18:31:43 harris41 Exp $ # TYPICAL USAGE of this Makefile is primarily for two targets: # "make build" and "make install". @@ -23,7 +23,7 @@ SAVE=program.pl.$(TIMESTAMP) LAUNCHSAVE=$(OUTSTREAM) $(SAVE) METAMTARGET="" MTARGET="" -VERSION=0.5.1 +VERSION=0.4 DIRTARGET=loncapa-$(VERSION) # =============================================== Help targets for the Makefile @@ -97,7 +97,7 @@ help_TARGETS: @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 "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" @@ -145,7 +145,7 @@ help_TARGETS: @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 "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" @@ -307,6 +307,7 @@ vanillatar: # ----------------------------- Point TEST to the internal make process echo '#!/bin/sh' > $(SOURCE)/TEST echo 'cd loncom/build; make test' >> $(SOURCE)/TEST + echo 'cd system_dependencies || cd loncom/build/system_dependencies; cp -v CPAN_STATUS_REPORT ../../../CPAN_STATUS_REPORT' >> $(SOURCE)/TEST # ----------------------------- Copy CHECKRPMS to the vanilla top-level cp -v $(SOURCE)/loncom/build/CHECKRPMS $(SOURCE)/CHECKRPMS # ----------------------- vanilla executables must indeed be executable @@ -708,6 +709,7 @@ clean: rm -f program.pl* rm -Rf lpmladm.* rm -f WARNINGS + rm -f CPAN_STATUS_REPORT rm -f $(SOURCE)/loncom/build/hosts.tab reallyclean: