Pull up 1.11

diff --git a/Makefile.conf b/Makefile.conf
index 9dc0a061c57b6e1697f616fc5aa3e21877368362..8acd174c2e757eb034ac8edbddcd01626b65f698 100644 (file)
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -166,8 +166,9 @@ VARDB = /var/db
 #FFMANEXT = .5
 ##--ultrix--
 
-## Linux
-##--linux--
+## Linux 1.x
+##--linux-1--
+#COPTS = -DLINUX_1_X
 #CF = cf/linux.h
 #ADMMANDIR = /usr/man/man8
 #ADMMANEXT = .8
@@ -176,7 +177,33 @@ VARDB = /var/db
 #VARRUN = /var/run
 #VARDB = /var/dhcpd
 #SCRIPT=linux
-##--linux--
+##--linux-1--
+
+## Linux 2.0
+##--linux-2.0--
+#COPTS = -DLINUX_2_0
+#CF = cf/linux.h
+#ADMMANDIR = /usr/man/man8
+#ADMMANEXT = .8
+#FFMANDIR = /usr/man/man5
+#FFMANEXT = .5
+#VARRUN = /var/run
+#VARDB = /var/dhcpd
+#SCRIPT=linux
+##--linux-2.0--
+
+## Linux 2.1
+##--linux-2.1--
+#COPTS = -DLINUX_2_1
+#CF = cf/linux.h
+#ADMMANDIR = /usr/man/man8
+#ADMMANEXT = .8
+#FFMANDIR = /usr/man/man5
+#FFMANEXT = .5
+#VARRUN = /var/run
+#VARDB = /var/dhcpd
+#SCRIPT=linux
+##--linux-2.1--
 
 ## SCO
 ##--sco--