--- loncom/build/Makefile	2004/08/10 15:35:58	1.166
+++ loncom/build/Makefile	2004/11/23 14:22:56	1.168.2.1
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 
-# $Id: Makefile,v 1.166 2004/08/10 15:35:58 albertel Exp $
+# $Id: Makefile,v 1.168.2.1 2004/11/23 14:22:56 albertel 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=CVS_HEAD
+VERSION=1.2.99.0
 # 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.
@@ -332,7 +332,8 @@ hosts_and_domain_tab: TEST_hosts_tab TES
 
 webserverconf:
 	cat $(SOURCE)/doc/loncapafiles/webserver.piml | \
-	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH)
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
 
 # ---------------- Top-level files such as README, UPDATE, CHECKRPMS, and TEST
 vanillatar:
@@ -584,16 +585,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 default \
+	perl lpml_parse.pl MANIFEST development $(DIST) \
 	'$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' >> $(SOURCE)/MANIFEST
 	cat $(SOURCE)/doc/loncapafiles/testfiles.lpml | \
-	perl lpml_parse.pl MANIFEST development default \
+	perl lpml_parse.pl MANIFEST development $(DIST) \
 	'$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' >> $(SOURCE)/MANIFEST
 	cat $(SOURCE)/doc/loncapafiles/installfiles.lpml | \
-	perl lpml_parse.pl MANIFEST development default \
+	perl lpml_parse.pl MANIFEST development $(DIST) \
 	'$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' >> $(SOURCE)/MANIFEST
 	cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \
-	perl lpml_parse.pl MANIFEST development default \
+	perl lpml_parse.pl MANIFEST development $(DIST) \
 	'$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' >> $(SOURCE)/MANIFEST
 
 # ------------ Files for top-level (the vanilla layer that the user first sees)