--- loncom/build/Makefile 2004/08/20 20:26:23 1.162.2.9 +++ loncom/build/Makefile 2004/08/06 19:22:21 1.164 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA -# $Id: Makefile,v 1.162.2.9 2004/08/20 20:26:23 albertel Exp $ +# $Id: Makefile,v 1.164 2004/08/06 19:22:21 matthew 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=1.1.99.5 +VERSION=CVS_HEAD # 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,10 +119,6 @@ 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." @@ -332,8 +328,7 @@ hosts_and_domain_tab: TEST_hosts_tab TES webserverconf: cat $(SOURCE)/doc/loncapafiles/webserver.piml | \ - perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \ - tee -a WARNINGS + perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) # ---------------- Top-level files such as README, UPDATE, CHECKRPMS, and TEST vanillatar: @@ -347,7 +342,6 @@ 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 @@ -415,16 +409,15 @@ updatequery: cat $(SOURCE)/doc/loncapafiles/updatequery.piml | \ perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(QUERYLAUNCH) +run_searchcat: + cat $(SOURCE)/doc/loncapafiles/run_searchcat.piml | \ + perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(QUERYLAUNCH) + accesscount_seed: cat $(SOURCE)/doc/loncapafiles/accesscount_seed.piml | \ 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) | \ @@ -449,7 +442,6 @@ postinstall: make webserverconf make reseval_fixup make accesscount_seed - make modify_config_files make clearoutoldspreadsheetcache make rpmcheck make ntpcheck @@ -581,16 +573,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 $(DIST) \ + 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 $(DIST) \ + 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 $(DIST) \ + 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 $(DIST) \ + 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) @@ -688,6 +680,10 @@ BinaryRoot: base_rpm_file_list # ======================================== *** MASTER DOCUMENTATION TARGETS *** +buildwebsite: + cd ../../doc/build; perl ./generate_web_pages.pl + + # Generates CVS:loncom/build/docs; root location of install.lon-capa.org doc: install -d docs