--- loncom/build/Makefile	2002/03/03 04:30:00	1.75
+++ loncom/build/Makefile	2002/04/21 16:44:56	1.79
@@ -1,9 +1,10 @@
 # The LearningOnline Network with CAPA
 
 # Scott Harrison
-# $Id: Makefile,v 1.75 2002/03/03 04:30:00 harris41 Exp $
+# $Id: Makefile,v 1.79 2002/04/21 16:44:56 harris41 Exp $
 
-DIST="default"
+DISTPROBE=`perl ./distprobe`
+DIST=$(DISTPROBE)
 CATEGORY="development"
 SOURCE="../.."
 TARGET=""
@@ -64,7 +65,8 @@ TEST_lpml_scripts:
 	cd ../test; perl filecomparetest.pl
 
 TEST_web_layer:
-	@echo "Testing of web layers is not yet implemented."
+	@echo "TESTING WEB LAYER"
+	cd weblayer_test; make
 
 TEST_hosts_tab:
 	@echo "Testing hosts.tab"
@@ -193,7 +195,8 @@ webserverconf:
 
 sanitycheck:
 	cat ../../doc/loncapafiles/sanitycheck.piml | \
-	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH)
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
 
 postinstall:
 	make webserverconf
@@ -209,6 +212,7 @@ install: TEST_hosts_tab Makefile.install
 	NORESTORECONF="$(NORESTORECONF)" configinstall
 	make postinstall
 	make warningnote
+	echo "You can run 'make test' to see if your system is ready to go!"
 
 Makefile.install: ../../doc/loncapafiles/loncapafiles.lpml lpml_parse.pl
 	cat ../../doc/loncapafiles/loncapafiles.lpml | \
@@ -222,8 +226,8 @@ build: Makefile.build pod2html.sh pod2ma
 
 Makefile.build: ../../doc/loncapafiles/loncapafiles.lpml lpml_parse.pl
 	cat ../../doc/loncapafiles/loncapafiles.lpml | \
-	perl lpml_parse.pl build $(CATEGORY) $(DIST) "../.." "" > \
-	Makefile.build
+	perl lpml_parse.pl build $(CATEGORY) $(DIST) "$(SOURCE)" "$(TARGET)" \
+	> Makefile.build
 
 RPM: BinaryRoot base_rpm_file_list
 	cat ../../doc/loncapafiles/loncapafiles.lpml | \