diff options
| author | gordon <gordon@FreeBSD.org> | 2003-06-29 18:46:18 +0000 |
|---|---|---|
| committer | gordon <gordon@FreeBSD.org> | 2003-06-29 18:46:18 +0000 |
| commit | 6b7019d5ed2baad877e25d3e76a4ebcfd3160c88 (patch) | |
| tree | 678d9e132073a3aaa1eac91dbcb82922f5f227c2 /sbin | |
| parent | 9beb6458f555f771d27552db74510cbe89a6ea38 (diff) | |
| download | FreeBSD-src-6b7019d5ed2baad877e25d3e76a4ebcfd3160c88.zip FreeBSD-src-6b7019d5ed2baad877e25d3e76a4ebcfd3160c88.tar.gz | |
Tweak a couple of utilities so they compile cleanly for /rescue. Mostly
path fixes.
Submitted by: Tim Kientzle <kientzle@acm.org>
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/dhclient/Makefile | 3 | ||||
| -rw-r--r-- | sbin/dhclient/client/Makefile | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/sbin/dhclient/Makefile b/sbin/dhclient/Makefile index 9f2384f..372adfd 100644 --- a/sbin/dhclient/Makefile +++ b/sbin/dhclient/Makefile @@ -52,8 +52,9 @@ OBJS+= dhcpctl/dhcpctl.o dhcpctl/callback.o dhcpctl/remote.o # though, so we must run ``make all'' instead when we are asked to # generate an individual object file. +# Note: Must have some commands here to override the default build action ${OBJS}: all - + @true .endif .include <bsd.subdir.mk> diff --git a/sbin/dhclient/client/Makefile b/sbin/dhclient/client/Makefile index f4a609d..c82c912 100644 --- a/sbin/dhclient/client/Makefile +++ b/sbin/dhclient/client/Makefile @@ -8,7 +8,12 @@ DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp PROG= dhclient SRCS= clparse.c dhclient.c -CFLAGS+= -DCLIENT_PATH='"PATH=/sbin:/bin:/usr/sbin:/usr/bin"' -Dwarn=dhcp_warn +.if defined(RESCUE) +CFLAGS+= -DCLIENT_PATH='"PATH=/rescue:/sbin:/bin:/usr/sbin:/usr/bin"' +.else +CFLAGS+= -DCLIENT_PATH='"PATH=/sbin:/bin:/usr/sbin:/usr/bin"' +.endif +CFLAGS+= -Dwarn=dhcp_warn DPADD= ${LIBDHCP} ${LIBRES} ${LIBOMAPI} ${LIBDST} LDADD= ${LIBDHCP} ${LIBRES} ${LIBOMAPI} ${LIBDST} |
