--- loncom/build/Makefile	2002/02/13 15:03:47	1.69
+++ 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.69 2002/02/13 15:03:47 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"
@@ -87,8 +89,6 @@ NET_hosts_tab:
 hosts_tab: TEST_hosts_tab
 	cat ../../doc/loncapafiles/loncapafiles.lpml | \
 	perl xfml_parse.pl ../../doc/loncapafiles/valid_hosts.xfml | \
-	perl xfml_parse.pl ../../doc/loncapafiles/no_globs.xfml | \
-	perl xfml_parse.pl ../../doc/loncapafiles/no_links.xfml | \
 	perl lpml_parse.pl install $(CATEGORY) $(DIST) "$(SOURCE)" \
 	"$(TARGET)" > Makefile.install
 	make -f Makefile.install directories
@@ -182,9 +182,7 @@ warningnote:
 		echo "!!!!  Please read the WARNINGS file !!!!"; \
 		echo "!!!!   to make sure everything is   !!!!"; \
 		echo "!!!!    correct and taken care of   !!!!"; \
-		echo "!!!!    (it is output below here)   !!!!"; \
 		echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"; \
-		cat WARNINGS; \
 	fi
 
 NET_webserverconf:
@@ -195,8 +193,14 @@ webserverconf:
 	cat ../../doc/loncapafiles/webserver.piml | \
 	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH)
 
+sanitycheck:
+	cat ../../doc/loncapafiles/sanitycheck.piml | \
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
+
 postinstall:
 	make webserverconf
+	make sanitycheck
 
 install: TEST_hosts_tab Makefile.install Makefile
 	echo -n "" > WARNINGS
@@ -206,7 +210,9 @@ install: TEST_hosts_tab Makefile.install
 	make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" links
 	make SOURCE="$(SOURCE)" TARGET="$(TARGET)" \
 	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 | \
@@ -220,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 | \
@@ -256,30 +262,6 @@ base_rpm_file_list:
 BinaryRoot: base_rpm_file_list
 	make TARGET='BinaryRoot' NORESTORECONF='1' install
 
-loncapaconfig:
-	rm -Rf LoncapaconfigRoot
-	install -d LoncapaconfigRoot/usr/src/
-	install -d LoncapaconfigRoot/usr/lib/python1.5/site-packages
-	install /usr/lib/python1.5/site-packages/kudzumodule.so \
-	LoncapaconfigRoot/usr/lib/python1.5/site-packages/kudzumodule.so
-	cd LoncapaconfigRoot/usr/src; cp -pR /mnt/drive/loncapaconfig .
-	install -d LoncapaconfigRoot/usr/sbin
-	@echo -e "#!/bin/sh\ncd /usr/src/loncapaconfig/usr/bin; \
-	./loncapaconfig\n" > LoncapaconfigRoot/usr/sbin/loncapaconfig
-	chmod u+x LoncapaconfigRoot/usr/sbin/loncapaconfig
-	find LoncapaconfigRoot -type d | xargs chmod o-wxr
-	find LoncapaconfigRoot -type f | xargs chmod o-wxr
-	find LoncapaconfigRoot/ -type d | grep 'src/lon' > \
-	loncapaconfig_file_list.txt
-	find LoncapaconfigRoot/ -type d | grep \
-	'^LoncapaconfigRoot/usr/lib/python1.5/site-packages' >> \
-	loncapaconfig_file_list.txt
-	find LoncapaconfigRoot/ -type f >> loncapaconfig_file_list.txt
-	cat loncapaconfig_file_list.txt | perl make_rpm.pl loncapaconfig 3.1 \
-	'' '' LoncapaconfigRoot
-	cp LON-CAPA-loncapaconfig-3.1-1.i386.rpm \
-	/mnt/drive/install.lon-capa.org/3.1/currentcdsource/RedHat/RPMS/.
-
 # Generates CVS:loncom/build/docs; root location of install.lon-capa.org
 doc:
 	install -d docs