--- loncom/build/Makefile 2003/03/21 19:02:41 1.141.2.1 +++ 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.141.2.1 2003/03/21 19:02:41 albertel 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.6.2 +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 @@ -571,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 $(VERSION) 1 '' '' \ - 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