--- loncom/build/Makefile	2000/12/21 15:07:20	1.18
+++ loncom/build/Makefile	2001/01/16 17:58:43	1.21
@@ -17,7 +17,7 @@ cd:
 	@echo -e "ifeq (\$$(S),1)" >> Makefile.cd.tmp
 	@echo -e "\t@echo \"There is enough disk space.  Good!\"" >> Makefile.cd.tmp
 	# set up commands to copy cd image from install.lon-capa.org (wget -r)
-	@echo -e "\tcd \$$(TARGET); wget -np -r -R "index.html" http://install.lon-capa.org/3.1/currentcdsource" >> Makefile.cd.tmp
+	@echo -e "\tcd \$$(TARGET); wget -np -N -r -l 1000 http://install.lon-capa.org/3.1/currentcdsource" >> Makefile.cd.tmp
 	@echo -e "\tcd \$$(TARGET); find ./install.lon-capa.org -name index.html | xargs rm -f" >> Makefile.cd.tmp
 	# set up cvs update commands
 	# set up cd image compilation (mkisofs)
@@ -25,6 +25,7 @@ cd:
 	@echo -e "else" >> Makefile.cd.tmp
 	@echo -e "\t@echo \"ERROR ******* Not enough disk space. There must be at least one gigabyte free\"" >> Makefile.cd.tmp
 	@echo -e "endif" >> Makefile.cd.tmp
+	@echo -e "\t@echo \"To mount this for something like an http network install; mount -t iso9660 -o ro,loop=/dev/loop0 /mnt/drive/redhat.img /home/harris41/public_html/mount\"" >> Makefile.cd.tmp
 	make -f Makefile.cd.tmp TARGET="$(CDTARGET)" cd
 
 cd_cover:
@@ -64,6 +65,7 @@ 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
 
 BinaryRoot:
 	perl parse.pl ../../doc/loncapafiles/loncapafiles.html BinaryRoot
@@ -76,3 +78,6 @@ clean:
 	rm -f Makefile.BinaryRoot
 	rm -f Makefile.build
 	rm -f Makefile.install
+	rm -f Makefile.install.tmp
+	rm -f Makefile.cd.tmp
+	rm -f *.rpm