--- loncom/build/Makefile 2002/05/09 04:58:03 1.105 +++ loncom/build/Makefile 2002/05/16 18:35:34 1.111 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Scott Harrison -# $Id: Makefile,v 1.105 2002/05/09 04:58:03 harris41 Exp $ +# $Id: Makefile,v 1.111 2002/05/16 18:35:34 harris41 Exp $ DISTPROBE=`perl ./distprobe` DIST=$(DISTPROBE) @@ -12,6 +12,7 @@ DIRTARGET=loncapa NORESTORECONF="0" HOSTNAME="" LAUNCH=| perl +QUERYLAUNCH=> /tmp/loncapa_query.pl; perl /tmp/loncapa_query.pl OUTSTREAM=> SAVE=program.pl.$(TIMESTAMP) LAUNCHSAVE=$(OUTSTREAM) $(SAVE) @@ -206,8 +207,7 @@ sanitycheck: updatequery: cat $(SOURCE)/doc/loncapafiles/updatequery.piml | \ - perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \ - tee -a WARNINGS + perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(QUERYLAUNCH) postinstall: make webserverconf @@ -438,7 +438,10 @@ tardist: echo '#!/bin/sh' > $(SOURCE)/UPDATE echo 'touch loncom/build/WARNINGS' >> $(SOURCE)/UPDATE; echo 'ln -s loncom/build/WARNINGS WARNINGS' >> $(SOURCE)/UPDATE; - echo 'cd loncom/build; make build; make install' >> $(SOURCE)/UPDATE + echo 'cd loncom/build; make build' >> $(SOURCE)/UPDATE + echo 'make install' >> $(SOURCE)/UPDATE + echo 'make updatequery' >> $(SOURCE)/UPDATE + echo 'make hosts_tab' >> $(SOURCE)/UPDATE # ----------------------------- Point TEST to the internal make process echo '#!/bin/sh' > $(SOURCE)/TEST echo 'cd loncom/build; make test' >> $(SOURCE)/TEST