--- loncom/build/Makefile 2002/09/05 21:08:55 1.130.2.3 +++ loncom/build/Makefile 2002/08/21 20:40:08 1.135 @@ -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.135 2002/08/21 20:40:08 albertel 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.5 DIRTARGET=loncapa-$(VERSION) # =============================================== Help targets for the Makefile @@ -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 @@ -353,10 +354,16 @@ reseval_fixup: perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \ tee -a WARNINGS +sendmail_fix: + cat $(SOURCE)/doc/loncapafiles/sendmail_fix.piml | \ + perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \ + tee -a WARNINGS + postinstall: make webserverconf make reseval_fixup make sanitycheck + make sendmail_fix VERSION: install -d $(TARGET)/etc @@ -708,6 +715,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: