--- loncom/build/Makefile 2013/08/07 18:20:25 1.203 +++ loncom/build/Makefile 2013/08/09 06:24:32 1.205 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA -# $Id: Makefile,v 1.203 2013/08/07 18:20:25 raeburn Exp $ +# $Id: Makefile,v 1.205 2013/08/09 06:24:32 raeburn Exp $ # TYPICAL USAGE of this Makefile is primarily for two targets: # "make build" and "make install". @@ -58,7 +58,7 @@ help_OPTIONS: @echo "* ADJUSTABLE OPTIONS *" @echo "(option) DIST can be centosN (N = 5 or 6), rhesN (N = 4, 5 or 6)," @echo " or scientificN (N = 4 or 5), or slesN (N = 9,10 or 11)," - @echo " or ubuntuN (N= 6, 8, 10 or 12), or fedoraN (N = 1 .. 19)," + @echo " or ubuntuN (N= 6, 8, 10 or 12), or fedoraN (N = 1 .. 19)," @echo " or suseN.M (N.M: 9.2 ... 12.3), or debianN (N = 5 or 6)," @echo " or default. It is unlikely you would ever need to specify" @echo " this, as it is automatically probed for." @@ -154,7 +154,7 @@ help_TARGETS: @echo " if so remove files from mimetexcache." @echo "latex_fmtutil: run utility to maintain TeX format files system-wide." @echo "removenolongerused.piml: check if there are files from previous - @echo " LON-CAPA version; if so, prompt for removal." + @echo " LON-CAPA version; if so, prompt for removal." @echo "updatequery: solicit the user for machine configuration" @echo " information; to be incorporated during an update" @echo " procedure (via the UPDATE command)" @@ -529,8 +529,7 @@ latex_fmtutil: removenolongerused: cat $(SOURCE)/doc/loncapafiles/removenolongerused.piml | \ - perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \ - tee -a WARNINGS + perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(QUERYLAUNCH) postinstall: make postaboutVERSION @@ -557,7 +556,6 @@ 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