--- loncom/build/Makefile	2002/01/07 22:12:21	1.54
+++ loncom/build/Makefile	2002/01/09 22:19:40	1.55
@@ -1,12 +1,13 @@
 # The LearningOnline Network with CAPA
 
 # Scott Harrison
-# $Id: Makefile,v 1.54 2002/01/07 22:12:21 harris41 Exp $
+# $Id: Makefile,v 1.55 2002/01/09 22:19:40 harris41 Exp $
 
 DIST="default"
 CATEGORY="development"
 SOURCE="../.."
 TARGET=""
+NORESTORECONF="0"
 
 help: 
 	@echo "*** You need to specify a valid target ***"
@@ -40,6 +41,9 @@ help:
 	@echo "           CVS:doc/otherfiles/rpm_list.txt"
 	@echo "rpmstatuspost: post the results of "make rpmstatus" to "
 	@echo "            TARGET/home/httpd/html/lon-status/rpmstatus.html"
+	@echo "RPM: build LON-CAPA-base RPM from CVS repository"
+	@echo "setup_RPM: build LON-CAPA-setup RPM from CVS repository"
+	@echo "           handy for CD-ROM generation"
 
 test: TEST_lpml_scripts TEST_system_dependencies TEST_web_layer
 	@echo "ALL SYSTEM DEPENDENCY TESTS SUCCESSFUL"
@@ -58,8 +62,8 @@ TEST_web_layer:
 HTML:
 	install -d HTML
 	cp ../../doc/loncapafiles/*.gif HTML
-	perl parse.pl ../../doc/loncapafiles/loncapafiles.html HTML > \
-	HTML/index.html
+	cat ../../doc/loncapafiles/loncapafiles.lpml | \
+	perl lpml_parse.pl html development default ../.. '' > HTML/index.html
 
 status:
 	install -d HTML
@@ -88,13 +92,15 @@ rpmstatuspost: rpmstatus
 	cp RPMSTATUS/rpmstatus.html /home/httpd/html/lon-status/rpmstatus.html
 
 configinstall: Makefile.configinstall
-	make -f Makefile.configinstall SOURCE="../.." TARGET="" configfiles
-	perl loncaparestoreconfigurations suffix .lpmlnew
+	make -f Makefile.configinstall SOURCE="$(SOURCE)" TARGET="$(TARGET)" \
+	configfiles
+	if (test "0" = $(NORESTORECONF)); then \
+	perl loncaparestoreconfigurations suffix .lpmlnew; fi
 
 Makefile.configinstall: ../../doc/loncapafiles/loncapafiles.lpml lpml_parse.pl
 	cat ../../doc/loncapafiles/loncapafiles.lpml | \
-	perl lpml_parse.pl configinstall $(CATEGORY) $(DIST) "../.." "" > \
-	Makefile.configinstall
+	perl lpml_parse.pl configinstall $(CATEGORY) $(DIST) "$(SOURCE)" \
+	"$(TARGET)" > Makefile.configinstall
 
 warningnote:
 	@if (test -s WARNINGS); then \
@@ -119,7 +125,8 @@ install: Makefile.install Makefile
 	directories
 	make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" files
 	make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" links
-	make configinstall
+	make SOURCE="$(SOURCE)" TARGET="$(TARGET)" \
+	NORESTORECONF="$(NORESTORECONF)" configinstall
 	make warningnote
 
 Makefile.install: ../../doc/loncapafiles/loncapafiles.lpml lpml_parse.pl
@@ -137,12 +144,30 @@ Makefile.build: ../../doc/loncapafiles/l
 	perl lpml_parse.pl build $(CATEGORY) $(DIST) "../.." "" > \
 	Makefile.build
 
-RPM: BinaryRoot
-	cat base_file_list.txt | perl make_rpm.pl base 3.1 '' '' BinaryRoot
-	cat setup_file_list.txt | perl make_rpm.pl setup 3.1 '' '' BinaryRoot
+RPM: BinaryRoot base_rpm_file_list
+	cat ../../doc/loncapafiles/loncapafiles.lpml | perl lpml_parse.pl make_rpm $(CATEGORY) $(DIST) $(SOURCE) $(TARGET) > base_customizerpm.xml
+	cat base_rpm_file_list.txt | perl make_rpm.pl base 3.2 '' '' \
+	BinaryRoot base_customizerpm.xml
+
+setup_RPM: SetupBinaryRoot
+	echo "SetupBinaryRoot/etc/passwd" > setup_rpm_file_list.txt
+	echo "SetupBinaryRoot/etc/group" >> setup_rpm_file_list.txt
+	echo "SetupBinaryRoot/etc/hosts.deny" >> setup_rpm_file_list.txt
+	echo "SetupBinaryRoot/home/www" >> setup_rpm_file_list.txt
+	echo "SetupBinaryRoot/etc/pam.d/passwd" >> setup_rpm_file_list.txt
+	echo "SetupBinaryRoot/etc/pam.d/login" >> setup_rpm_file_list.txt
+	perl setup_rpm_binaryroot.pl
+	cat setup_rpm_file_list.txt | perl make_rpm.pl setup 3.2 '' '' \
+	SetupBinaryRoot customizerpm.xml
+
+
+base_rpm_file_list:
+	cat ../../doc/loncapafiles/loncapafiles.lpml | \
+	perl lpml_parse.pl rpm_file_list $(CATEGORY) $(DIST) $(SOURCE) \
+	'BinaryRoot' | sort > base_rpm_file_list.txt
 
-BinaryRoot:
-	perl parse.pl ../../doc/loncapafiles/loncapafiles.html BinaryRoot
+BinaryRoot: base_rpm_file_list
+	make TARGET='BinaryRoot' NORESTORECONF='1' install
 
 loncapaconfig:
 	rm -Rf LoncapaconfigRoot
@@ -213,3 +238,5 @@ clean:
 	rm -Rf HTML
 	rm -f Makefile.build
 	rm -f Makefile.install
+	rm -Rf BinaryRoot
+	rm -Rf SetupBinaryRoot