0f9f19ccd5
- Added back Requires for perl since dhcpd-conf-to-ldap needs it (#225691) - Put copies of dhcp-options and dhcp-eval man pages in the dhcp and dhclient packages rather than having the elaborate symlink collection - Explicitly name man pages in the %files listings - Use the %{_sysconfdir} and %{_initrddir} macros (#225691) - Use macros for commands in %build and %install - Split README.ldap, draft-ietf-dhc-ldap-schema-01.txt, and dhcpd-conf-to-ldap.pl out of the LDAP patch - Split linux.dbus-example script out of the extended new option info patch - Remove unnecessary changes from the Makefile patch
49 lines
1.4 KiB
Diff
49 lines
1.4 KiB
Diff
--- dhcp-3.0.5/Makefile.Makefile 2004-06-10 13:59:10.000000000 -0400
|
|
+++ dhcp-3.0.5/Makefile 2006-11-10 11:09:32.000000000 -0500
|
|
@@ -33,7 +33,7 @@
|
|
if [ ! -d work.$$sysname ]; then \
|
|
echo No build directory for $$sysname - please run ./configure.; \
|
|
else \
|
|
- (cd work.$$sysname; make all); \
|
|
+ (cd work.$$sysname; $(MAKE) all); \
|
|
fi
|
|
|
|
install:
|
|
@@ -41,7 +41,7 @@
|
|
if [ ! -d work.$$sysname ]; then \
|
|
echo No build directory for $$sysname - please run ./configure.; \
|
|
else \
|
|
- (cd work.$$sysname; make install); \
|
|
+ (cd work.$$sysname; $(MAKE) install); \
|
|
fi
|
|
|
|
depend:
|
|
@@ -49,7 +49,7 @@
|
|
if [ ! -d work.$$sysname ]; then \
|
|
echo No build directory for $$sysname - please run ./configure.; \
|
|
else \
|
|
- (cd work.$$sysname; make depend); \
|
|
+ (cd work.$$sysname; $(MAKE) depend); \
|
|
fi
|
|
|
|
clean:
|
|
@@ -81,6 +81,6 @@
|
|
if [ ! -d work.$$sysname ]; then \
|
|
echo No build directory for $$sysname - please run ./configure.; \
|
|
else \
|
|
- (cd work.$$sysname; make links); \
|
|
+ (cd work.$$sysname; $(MAKE) links); \
|
|
fi
|
|
|
|
--- dhcp-3.0.5/Makefile.conf.Makefile 2005-06-16 15:39:35.000000000 -0400
|
|
+++ dhcp-3.0.5/Makefile.conf 2006-11-10 11:12:43.000000000 -0500
|
|
@@ -49,7 +49,7 @@
|
|
DEBUG = -g
|
|
#WARNERR = -Werror
|
|
RANLIB = ranlib
|
|
-MKDEP = mkdep
|
|
+MKDEP = $(CC)
|
|
CLIENT_PATH = '"PATH=/usr/ucb:/usr/bin:/usr/sbin:/bin:/sbin"'
|
|
|
|
BINDLIB = ../minires/libres.a
|