--- loncom/build/Makefile 2013/08/09 06:37:13 1.201.2.4 +++ loncom/build/Makefile 2013/08/07 22:35:29 1.204 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA -# $Id: Makefile,v 1.201.2.4 2013/08/09 06:37:13 raeburn Exp $ +# $Id: Makefile,v 1.204 2013/08/07 22:35:29 raeburn Exp $ # TYPICAL USAGE of this Makefile is primarily for two targets: # "make build" and "make install". @@ -26,9 +26,9 @@ SAVE=program.pl.$(TIMESTAMP) LAUNCHSAVE=$(OUTSTREAM) $(SAVE) METAMTARGET="" MTARGET="" -VERSION=2.11.0.RC1 +VERSION=CVS_HEAD SHOWVERSION=$(VERSION) -NEXTVERSION=2.12 +NEXTVERSION=2.11 ifeq (CVS_HEAD,${VERSION}) SHOWVERSION=$(NEXTVERSION).$(VERSION) endif @@ -529,7 +529,8 @@ latex_fmtutil: removenolongerused: cat $(SOURCE)/doc/loncapafiles/removenolongerused.piml | \ - perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(QUERYLAUNCH) + perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \ + tee -a WARNINGS postinstall: make postaboutVERSION @@ -556,6 +557,7 @@ postinstall: make mimetex_version_check make verify_domconfiguser make latex_fmtutil + make removenolongerused sed -i "s/\x08\x08*/.../g" WARNINGS VERSION: install -d $(TARGET)/etc