mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-09-01 14:55:30 +00:00
Code Issues Releases Wiki Activity

- For Linux, compute major and minor version instead of doing pattern

Browse Source 
matching, and substitute it in the Makefile.
This commit is contained in:
Ted Lemon
1999-07-13 17:58:43 +00:00
parent 498eae9150
commit 6057415f79
2 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile.conf
View File

@@ -43,6 +43,13 @@ COPTS = $(BINDDEF)
#BINDDEF = -DNSUPDATE #BINDDEF = -DNSUPDATE
##--nsupdate-- ##--nsupdate--
##--majver
MAJORVERSION=MajorVersion
##--majver
##--minver
MINORVERSION=MinorVersion
##--minver
## Porting:: ## Porting::
# #
# For each supported operating system, there is a block of text below # For each supported operating system, there is a block of text below
@@ -183,7 +190,7 @@ COPTS = $(BINDDEF)
## Linux 1.x ## Linux 1.x
##--linux-1-- ##--linux-1--
#COPTS = -DLINUX_MAJOR=1 -DLINUX_MINOR=0 $(BINDDEF) #COPTS = -DLINUX_MAJOR=$(MAJORVERSION) -DLINUX_MINOR=$(MINORVERSION) $(BINDDEF)
#CF = cf/linux.h #CF = cf/linux.h
#ADMMANDIR = /usr/man/man8 #ADMMANDIR = /usr/man/man8
#ADMMANEXT = .8 #ADMMANEXT = .8
@@ -197,7 +204,7 @@ COPTS = $(BINDDEF)
## Linux 2.0 ## Linux 2.0
##--linux-2.0-- ##--linux-2.0--
#COPTS = -DLINUX_MAJOR=2 -DLINUX_MINOR=0 $(BINDDEF) #COPTS = -DLINUX_MAJOR=$(MAJORVERSION) -DLINUX_MINOR=$(MINORVERSION) $(BINDDEF)
#CF = cf/linux.h #CF = cf/linux.h
#ADMMANDIR = /usr/man/man8 #ADMMANDIR = /usr/man/man8
#ADMMANEXT = .8 #ADMMANEXT = .8
@@ -211,7 +218,7 @@ COPTS = $(BINDDEF)
## Linux 2.1 ## Linux 2.1
##--linux-2.1-- ##--linux-2.1--
#COPTS = -DLINUX_MAJOR=2 -DLINUX_MINOR=1 $(BINDDEF) #COPTS = -DLINUX_MAJOR=$(MAJORVERSION) -DLINUX_MINOR=$(MINORVERSION) $(BINDDEF)
#CF = cf/linux.h #CF = cf/linux.h
#ADMMANDIR = /usr/man/man8 #ADMMANDIR = /usr/man/man8
#ADMMANEXT = .8 #ADMMANEXT = .8
@@ -225,7 +232,7 @@ COPTS = $(BINDDEF)
## Linux 2.2 ## Linux 2.2
##--linux-2.2-- ##--linux-2.2--
#COPTS = -DLINUX_MAJOR=2 -DLINUX_MINOR=2 $(BINDDEF) #COPTS = -DLINUX_MAJOR=$(MAJORVERSION) -DLINUX_MINOR=$(MINORVERSION) $(BINDDEF)
#CF = cf/linux.h #CF = cf/linux.h
#ADMMANDIR = /usr/man/man8 #ADMMANDIR = /usr/man/man8
#ADMMANEXT = .8 #ADMMANEXT = .8

24
configure vendored
View File

@@ -31,11 +31,18 @@ if [ "$sysname" = "" ]; then
sysname=alphaosf sysname=alphaosf
fi;; fi;;
Linux) Linux)
case `uname -r` in release=`uname -r`
1*) sysname=linux-1 ;; minor=`echo $release |sed -e 's/[0-9]*\.\([0-9][0-9]*\)$/\1/'`
2.1*) sysname=linux-2.1 ;; major=`echo $release |sed -e 's/\([0-9][0-9]*\)\.[0-9]*$/\1/'`
2.2*) sysname=linux-2.2 ;;
2*) sysname=linux-2.0 ;; case $major in
1) sysname=linux-1 ;;
2) case $minor in
0) sysname=linux-2.0 ;;
1) sysname=linux-2.1 ;;
2) sysname=linux-2.2 ;;
*) sysname=linux-2.2 ;;
esac;;
esac;; esac;;
SunOS) SunOS)
case `uname -r` in case `uname -r` in
@@ -88,9 +95,14 @@ if [ "$sysname" = "" ]; then
fi fi
echo "System Type: $sysname" echo "System Type: $sysname"
if [ x$major != x ] && [ x$minor != x ]; then
majversubst="-e /^##--majver--/,/^##--majver--/s/MajorVersion/$major/"
majversubst="-e /^##--minver--/,/^##--minver--/s/MinorVersion/$minor/"
fi
for foo in . client server relay common; do for foo in . client server relay common; do
(sed $nsupdate -e "/^##--${sysname}--/,/^##--${sysname}--/s/^#//" \ (sed $nsupdate $majversubst $minversubst \
-e "/^##--${sysname}--/,/^##--${sysname}--/s/^#//" \
<Makefile.conf; cat site.conf; cat $foo/Makefile.dist) \ <Makefile.conf; cat site.conf; cat $foo/Makefile.dist) \
>$foo/Makefile >$foo/Makefile
done done