--- loncom/build/Makefile 2004/05/19 16:31:43 1.159 +++ loncom/build/Makefile 2004/08/10 20:07:35 1.162.2.7 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA -# $Id: Makefile,v 1.159 2004/05/19 16:31:43 matthew Exp $ +# $Id: Makefile,v 1.162.2.7 2004/08/10 20:07:35 albertel Exp $ # TYPICAL USAGE of this Makefile is primarily for two targets: # "make build" and "make install". @@ -22,7 +22,7 @@ SAVE=program.pl.$(TIMESTAMP) LAUNCHSAVE=$(OUTSTREAM) $(SAVE) METAMTARGET="" MTARGET="" -VERSION=CVS_HEAD +VERSION=1.1.99.4 # 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. @@ -119,7 +119,12 @@ help_TARGETS: @echo " system" @echo "sanitycheck: probe for common errors and recommend fixes to" @echo " the user" + @echo "accesscount_seed: Migrate the access counting mechanism from " + @echo " nohist_reseval.db to nohist_accesscount.db." + @echo "modify_config_files: Perform automatic update of the " + @echo " configuration files for yum and MySQL." @echo "ntpcheck: test to see if ntp is installed and running." + @echo "cron_lpmlcheck: remove cron file /etc/cron.d/loncapa.lpml." @echo "rpmcheck: test to see if rpms known to confict are installed." @echo "updatequery: solicit the user for machine configuration" @echo " information; to be incorporated during an update" @@ -341,6 +346,7 @@ vanillatar: echo 'make updatequery' >> $(SOURCE)/UPDATE echo 'make hosts_and_domain_tab' >> $(SOURCE)/UPDATE echo 'make postinstall' >> $(SOURCE)/UPDATE + echo 'make run_searchcat' >> $(SOURCE)/UPDATE echo 'make aboutVERSION' >> $(SOURCE)/UPDATE echo 'make warningnote' >> $(SOURCE)/UPDATE # ----------------------------- Point TEST to the internal make process @@ -388,6 +394,12 @@ ntpcheck: perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \ tee -a WARNINGS +cron_lpmlcheck: + cat $(SOURCE)/doc/loncapafiles/cron_lpmlcheck.piml | \ + perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \ + tee -a WARNINGS + + rpmcheck: cat $(SOURCE)/doc/loncapafiles/rpmcheck.piml | \ perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \ @@ -407,6 +419,11 @@ accesscount_seed: perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \ tee -a WARNINGS +modify_config_files: + cat $(SOURCE)/doc/loncapafiles/modify_config_files.piml | \ + perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \ + tee -a WARNINGS + reseval_fixup: cat $(SOURCE)/doc/loncapafiles/reseval_fixup.piml | \ perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \ @@ -431,9 +448,11 @@ postinstall: make webserverconf make reseval_fixup make accesscount_seed + make modify_config_files make clearoutoldspreadsheetcache make rpmcheck make ntpcheck + make cron_lpmlcheck make sanitycheck make sendmail_fix make ownership_fix @@ -561,16 +580,16 @@ MANIFEST_cvs: # ------------------- MANIFEST the building, testing and standard loncapa files MANIFEST_lpml: cat $(SOURCE)/doc/loncapafiles/buildfiles.lpml | \ - perl lpml_parse.pl MANIFEST development default \ + perl lpml_parse.pl MANIFEST development $(DIST) \ '$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' >> $(SOURCE)/MANIFEST cat $(SOURCE)/doc/loncapafiles/testfiles.lpml | \ - perl lpml_parse.pl MANIFEST development default \ + perl lpml_parse.pl MANIFEST development $(DIST) \ '$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' >> $(SOURCE)/MANIFEST cat $(SOURCE)/doc/loncapafiles/installfiles.lpml | \ - perl lpml_parse.pl MANIFEST development default \ + perl lpml_parse.pl MANIFEST development $(DIST) \ '$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' >> $(SOURCE)/MANIFEST cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \ - perl lpml_parse.pl MANIFEST development default \ + perl lpml_parse.pl MANIFEST development $(DIST) \ '$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' >> $(SOURCE)/MANIFEST # ------------ Files for top-level (the vanilla layer that the user first sees)