1 diff -urN dhcp-3.1.0.orig/client/Makefile.dist dhcp-3.1.0/client/Makefile.dist
2 --- dhcp-3.1.0.orig/client/Makefile.dist 2005-03-17 12:14:55.000000000 -0800
3 +++ dhcp-3.1.0/client/Makefile.dist 2008-06-12 01:12:58.000000000 -0700
5 CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS) \
6 -DCLIENT_PATH=${CLIENT_PATH}
8 -all: $(PROG) $(CATMANPAGES)
12 for dir in $(CLIENTBINDIR) $(ETC) $(FFMANDIR) $(ADMMANDIR) $(VARDB); \
14 $(DESTDIR)$(CLIENTBINDIR)/dhclient-script; \
15 $(CHMOD) 700 $(DESTDIR)$(CLIENTBINDIR)/dhclient-script; \
17 - $(MANINSTALL) $(MANFROM) dhclient.$(MANCAT)8 $(MANTO) \
18 - $(DESTDIR)$(ADMMANDIR)/dhclient$(ADMMANEXT)
19 - $(MANINSTALL) $(MANFROM) dhclient-script.$(MANCAT)8 $(MANTO) \
20 - $(DESTDIR)$(ADMMANDIR)/dhclient-script$(ADMMANEXT)
21 - $(MANINSTALL) $(MANFROM) dhclient.conf.$(MANCAT)5 $(MANTO) \
22 - $(DESTDIR)$(FFMANDIR)/dhclient.conf$(FFMANEXT)
23 - $(MANINSTALL) $(MANFROM) dhclient.leases.$(MANCAT)5 $(MANTO) \
24 - $(DESTDIR)$(FFMANDIR)/dhclient.leases$(FFMANEXT)
27 $(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRCS)
28 diff -urN dhcp-3.1.0.orig/common/Makefile.dist dhcp-3.1.0/common/Makefile.dist
29 --- dhcp-3.1.0.orig/common/Makefile.dist 2005-03-17 12:14:56.000000000 -0800
30 +++ dhcp-3.1.0/common/Makefile.dist 2008-06-12 01:12:58.000000000 -0700
32 INCLUDES = -I$(TOP) $(BINDINC) -I$(TOP)/includes
33 CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
35 -all: libdhcp.a $(CATMANPAGES)
44 - $(MANINSTALL) $(MANFROM) dhcp-options.$(MANCAT)5 $(MANTO) \
45 - $(DESTDIR)$(FFMANDIR)/dhcp-options$(FFMANEXT)
46 - $(MANINSTALL) $(MANFROM) dhcp-eval.$(MANCAT)5 $(MANTO) \
47 - $(DESTDIR)$(FFMANDIR)/dhcp-eval$(FFMANEXT)
50 $(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRC)
51 diff -urN dhcp-3.1.0.orig/dhcpctl/Makefile.dist dhcp-3.1.0/dhcpctl/Makefile.dist
52 --- dhcp-3.1.0.orig/dhcpctl/Makefile.dist 2005-03-17 12:15:02.000000000 -0800
53 +++ dhcp-3.1.0/dhcpctl/Makefile.dist 2008-06-12 01:13:51.000000000 -0700
55 DHCPCTLLIBS = libdhcpctl.a ../common/libdhcp.a $(BINDLIB) \
56 ../omapip/libomapi.a ../dst/libdst.a
58 -all: libdhcpctl.a omshell cltest $(CATMANPAGES)
59 +all: libdhcpctl.a omshell cltest
61 omshell: omshell.o $(DHCPCTLLIBS)
62 $(CC) $(DEBUG) $(LFLAGS) -o omshell omshell.o $(DHCPCTLLIBS) $(LIBS)
64 ar cruv libdhcpctl.a $(OBJ)
65 $(RANLIB) libdhcpctl.a
67 -install: all $(CATMANPAGES)
69 for dir in $(LIBDIR) $(LIBMANDIR) $(INCDIR) $(USRMANDIR) \
73 $(CHMOD) 644 $(DESTDIR)$(LIBDIR)/libdhcpctl.a
74 $(INSTALL) dhcpctl.h $(DESTDIR)$(INCDIR)
75 $(CHMOD) 644 $(DESTDIR)$(INCDIR)/dhcpctl.h
76 - for man in $(MAN); do \
77 - prefix=`echo $$man |sed -e 's/\.[0-9]$$//'`; \
78 - suffix=`echo $$man |sed -e 's/.*\.\([0-9]\)$$/\1/'`; \
79 - $(MANINSTALL) $(MANFROM) $${prefix}.$(MANCAT)$${suffix} $(MANTO) \
80 - $(DESTDIR)$(LIBMANDIR)/$${prefix}$(LIBMANEXT); \
82 $(INSTALL) omshell $(DESTDIR)$(USERBINDIR)
83 $(CHMOD) 755 $(DESTDIR)$(USERBINDIR)/omshell
84 - $(MANINSTALL) $(MANFROM) omshell.$(MANCAT)1 $(MANTO) \
85 - $(DESTDIR)$(USRMANDIR)/omshell$(USRMANEXT)
88 $(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRC)
89 diff -urN dhcp-3.1.0.orig/omapip/Makefile.dist dhcp-3.1.0/omapip/Makefile.dist
90 --- dhcp-3.1.0.orig/omapip/Makefile.dist 2005-03-17 12:15:20.000000000 -0800
91 +++ dhcp-3.1.0/omapip/Makefile.dist 2008-06-12 01:12:58.000000000 -0700
93 INCLUDES = $(BINDINC) -I$(TOP)/includes
94 CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
96 -all: libomapi.a svtest $(CATMANPAGES)
97 +all: libomapi.a svtest
99 svtest: test.o libomapi.a $(BINDLIB) ../dst/libdst.a
100 $(CC) $(DEBUG) $(LFLAGS) -o svtest test.o $(BINDLIB) \
102 $(DESTDIR)$(INCDIR)/isc-dhcp; \
103 $(CHMOD) 644 $(DESTDIR)$(INCDIR)/isc-dhcp/$$file; \
105 - for man in $(MAN); do \
106 - prefix=`echo $$man |sed -e 's/\.[0-9]$$//'`; \
107 - suffix=`echo $$man |sed -e 's/.*\.\([0-9]\)$$/\1/'`; \
108 - $(MANINSTALL) $(MANFROM) $${prefix}.$(MANCAT)$${suffix} $(MANTO) \
109 - $(DESTDIR)$(LIBMANDIR)/$${prefix}$(LIBMANEXT); \
113 $(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRC)
114 diff -urN dhcp-3.1.0.orig/relay/Makefile.dist dhcp-3.1.0/relay/Makefile.dist
115 --- dhcp-3.1.0.orig/relay/Makefile.dist 2005-03-17 12:15:24.000000000 -0800
116 +++ dhcp-3.1.0/relay/Makefile.dist 2008-06-12 01:12:58.000000000 -0700
118 DHCPLIB = ../common/libdhcp.a $(BINDLIB) ../omapip/libomapi.a ../dst/libdst.a
119 CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
121 -all: $(PROG) $(CATMANPAGES)
125 for dir in $(BINDIR) $(ADMMANDIR); do \
128 $(INSTALL) dhcrelay $(DESTDIR)$(BINDIR)
129 $(CHMOD) 755 $(DESTDIR)$(BINDIR)/dhcrelay
130 - $(MANINSTALL) $(MANFROM) dhcrelay.$(MANCAT)8 $(MANTO) \
131 - $(DESTDIR)$(ADMMANDIR)/dhcrelay$(ADMMANEXT)
134 $(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRCS)
135 diff -urN dhcp-3.1.0.orig/server/Makefile.dist dhcp-3.1.0/server/Makefile.dist
136 --- dhcp-3.1.0.orig/server/Makefile.dist 2006-07-25 06:26:00.000000000 -0700
137 +++ dhcp-3.1.0/server/Makefile.dist 2008-06-12 01:12:58.000000000 -0700
139 DHCPLIB = ../common/libdhcp.a $(BINDLIB) ../omapip/libomapi.a ../dst/libdst.a
140 CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
142 -all: $(PROG) $(CATMANPAGES)
146 for dir in $(BINDIR) $(ADMMANDIR) $(FFMANDIR) $(VARDB); do \
149 $(INSTALL) dhcpd $(DESTDIR)$(BINDIR)
150 $(CHMOD) 755 $(DESTDIR)$(BINDIR)/dhcpd
151 - $(MANINSTALL) $(MANFROM) dhcpd.$(MANCAT)8 $(MANTO) \
152 - $(DESTDIR)$(ADMMANDIR)/dhcpd$(ADMMANEXT)
153 - $(MANINSTALL) $(MANFROM) dhcpd.conf.$(MANCAT)5 $(MANTO) \
154 - $(DESTDIR)$(FFMANDIR)/dhcpd.conf$(FFMANEXT)
155 - $(MANINSTALL) $(MANFROM) dhcpd.leases.$(MANCAT)5 $(MANTO) \
156 - $(DESTDIR)$(FFMANDIR)/dhcpd.leases$(FFMANEXT)
157 $(TOUCH) $(DESTDIR)$(VARDB)/dhcpd.leases
158 # Note file mode is hardcoded to mode 0664 in server/db.c (889).
159 $(CHMOD) 664 $(DESTDIR)$(VARDB)/dhcpd.leases