Pull up 1.25 and 1.26

diff --git a/Makefile.conf b/Makefile.conf
index d388c12421da415aecd7d8a4dd814e62695bad51..01269f26d720618f3ef75ea9e7d89aea00fd0739 100644 (file)
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -47,6 +47,16 @@ ETC = /etc
 VARRUN = /var/run
 VARDB = /var/db
 
+# Major version number (if applicable)
+##--majver--
+MAJORVERSION=MajorVersion
+##--majver--
+
+# Minor version number (if applicable)
+##--minver--
+MINORVERSION=MinorVersion
+##--minver--
+
 ## Porting::
 #
 # For each supported operating system, there is a block of text below
@@ -188,7 +198,7 @@ VARDB = /var/db
 
 ## Linux 1.x
 ##--linux-1--
-#COPTS = -DLINUX_MAJOR=1 -DLINUX_MINOR=0
+#COPTS = -DLINUX_MAJOR=$(MAJORVERSION) -DLINUX_MINOR=$(MINORVERSION)
 #CF = cf/linux.h
 #ADMMANDIR = /usr/man/man8
 #ADMMANEXT = .8
@@ -202,7 +212,7 @@ VARDB = /var/db
 
 ## Linux 2.0
 ##--linux-2.0--
-#COPTS = -DLINUX_MAJOR=2 -DLINUX_MINOR=0
+#COPTS = -DLINUX_MAJOR=$(MAJORVERSION) -DLINUX_MINOR=$(MINORVERSION)
 #CF = cf/linux.h
 #ADMMANDIR = /usr/man/man8
 #ADMMANEXT = .8
@@ -216,7 +226,7 @@ VARDB = /var/db
 
 ## Linux 2.1
 ##--linux-2.1--
-#COPTS = -DLINUX_MAJOR=2 -DLINUX_MINOR=1
+#COPTS = -DLINUX_MAJOR=$(MAJORVERSION) -DLINUX_MINOR=$(MINORVERSION)
 #CF = cf/linux.h
 #ADMMANDIR = /usr/man/man8
 #ADMMANEXT = .8
@@ -230,7 +240,7 @@ VARDB = /var/db
 
 ## Linux 2.2
 ##--linux-2.2--
-#COPTS = -DLINUX_MAJOR=2 -DLINUX_MINOR=2
+#COPTS = -DLINUX_MAJOR=$(MAJORVERSION) -DLINUX_MINOR=$(MINORVERSION)
 #CF = cf/linux.h
 #ADMMANDIR = /usr/man/man8
 #ADMMANEXT = .8