--- loncom/build/Makefile	2002/10/13 17:35:04	1.136
+++ loncom/build/Makefile	2003/01/20 17:39:00	1.142
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 
 # Scott Harrison, your friendly neighborhood volunteer
-# $Id: Makefile,v 1.136 2002/10/13 17:35:04 harris41 Exp $
+# $Id: Makefile,v 1.142 2003/01/20 17:39:00 harris41 Exp $
 
 # TYPICAL USAGE of this Makefile is primarily for two targets:
 # "make build" and "make install".
@@ -23,7 +23,11 @@ SAVE=program.pl.$(TIMESTAMP)
 LAUNCHSAVE=$(OUTSTREAM) $(SAVE)
 METAMTARGET=""
 MTARGET=""
-VERSION=0.5
+VERSION=0.6.1
+# The current working definition for "RELEASE" is: changes not in the software,
+# but in the operating system dependent packaging of the software.  Thus, the
+# generic tarball releases do not need to have a release number specified.
+RELEASE=1 # As a general rule for now, this is always being set to "1".
 DIRTARGET=loncapa-$(VERSION)
 
 # =============================================== Help targets for the Makefile
@@ -365,6 +369,11 @@ reseval_fixup:
 	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
 	tee -a WARNINGS
 
+clearoutoldspreadsheetcache:
+	cat $(SOURCE)/doc/loncapafiles/clearoutoldspreadsheetcache.piml | \
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
+
 sendmail_fix:
 	cat $(SOURCE)/doc/loncapafiles/sendmail_fix.piml | \
 	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
@@ -373,6 +382,7 @@ sendmail_fix:
 postinstall:
 	make webserverconf
 	make reseval_fixup
+	make clearoutoldspreadsheetcache
 	make sanitycheck
 	make sendmail_fix
 
@@ -494,6 +504,9 @@ MANIFEST_lpml:
 	cat $(SOURCE)/doc/loncapafiles/testfiles.lpml | \
 	perl lpml_parse.pl MANIFEST development default \
 	'$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' >> $(SOURCE)/MANIFEST
+	cat $(SOURCE)/doc/loncapafiles/installfiles.lpml | \
+	perl lpml_parse.pl MANIFEST development default \
+	'$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' >> $(SOURCE)/MANIFEST
 	cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \
 	perl lpml_parse.pl MANIFEST development default \
 	'$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' >> $(SOURCE)/MANIFEST
@@ -562,8 +575,8 @@ RPM: BinaryRoot base_rpm_file_list
 	cat $(SOURCE)/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
+	cat base_rpm_file_list.txt | perl make_rpm.pl base $(VERSION) \
+	$(RELEASE) '' '' BinaryRoot base_customizerpm.xml
 
 DPKG:
 	make TARGET='lon-capa-$(VERSION)' NORESTORECONF='1' install