[LON-CAPA-cvs] cvs: loncom /build Makefile

harris41 lon-capa-cvs@mail.lon-capa.org
Mon, 20 Jan 2003 17:39:00 -0000


harris41		Mon Jan 20 12:39:00 2003 EDT

  Modified files:              
    /loncom/build	Makefile 
  Log:
  supporting a release number (in advance of rpm-based filesystem handling...
  which will happen sometime soon I hope)
  
  
Index: loncom/build/Makefile
diff -u loncom/build/Makefile:1.141 loncom/build/Makefile:1.142
--- loncom/build/Makefile:1.141	Mon Jan 13 15:38:40 2003
+++ loncom/build/Makefile	Mon Jan 20 12:39:00 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 
 # Scott Harrison, your friendly neighborhood volunteer
-# $Id: Makefile,v 1.141 2003/01/13 20:38:40 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".
@@ -24,6 +24,10 @@
 METAMTARGET=""
 MTARGET=""
 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 @@
 	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