--- loncom/build/Makefile	2000/12/16 14:56:31	1.11
+++ loncom/build/Makefile	2001/01/16 17:58:43	1.21
@@ -3,14 +3,30 @@
 # Scott Harrison
 # November 2000
 
+CDTARGET="."
+
 all: 
 	# nothing yet here
 
 cd: 
+	# Build temporary script to get cd
 	# make sure there is enough disk space
-	# copy cd image from install.lon-capa.org (wget -r)
-	# add in appropriate files from CVS
-	# compile cd image (mkisofs)
+	@echo "# Automatically generated Makefile for LON-CAPA" > Makefile.cd.tmp
+	@/bin/df $(CDTARGET) | perl -e '@l=<>;split(/\s+/,$$l[1]);$$s=@_[3]*1024;if ($$s>1000000000) {print "\S=1\n";} else {print "\S=0\n";}' >> Makefile.cd.tmp
+	@echo "cd:" >> Makefile.cd.tmp
+	@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 -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)
+	@echo -e "\tcd \$$(TARGET)/install.lon-capa.org/3.1/currentcdsource/; mkisofs -v -R -T -V \"LON-CAPA and Red Hat 6.2\" -b images/boot.img -c boot.cat -o \$$(TARGET)/redhat.img ." >> Makefile.cd.tmp
+	@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:
 
@@ -49,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
@@ -61,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