diff options
| author | des <des@FreeBSD.org> | 2005-06-10 06:12:53 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2005-06-10 06:12:53 +0000 |
| commit | 2bb8de20fe30f1cc02ae127bd04e473b19e23441 (patch) | |
| tree | 086bc6374cc176de9e2533a2b8b25ab0ef497b15 /libexec | |
| parent | 508e67396ea922c5e3249f730d7004fa6edba0b2 (diff) | |
| download | FreeBSD-src-2bb8de20fe30f1cc02ae127bd04e473b19e23441.zip FreeBSD-src-2bb8de20fe30f1cc02ae127bd04e473b19e23441.tar.gz | |
Remove kludges intended to support src trees with partial obj trees.
Discussed with: ru
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/mail.local/Makefile | 8 | ||||
| -rw-r--r-- | libexec/smrsh/Makefile | 8 | ||||
| -rw-r--r-- | libexec/telnetd/Makefile | 4 |
3 files changed, 4 insertions, 16 deletions
diff --git a/libexec/mail.local/Makefile b/libexec/mail.local/Makefile index 92a68a4..57837d1 100644 --- a/libexec/mail.local/Makefile +++ b/libexec/mail.local/Makefile @@ -10,12 +10,8 @@ MAN= mail.local.8 CFLAGS+=-I${SENDMAIL_DIR}/include -I. WFORMAT=0 -.if exists(${.OBJDIR}/../../lib/libsm) -LIBSMDIR:= ${.OBJDIR}/../../lib/libsm -.else -LIBSMDIR!= cd ${.CURDIR}/../../lib/libsm; make -V .OBJDIR -.endif -LIBSM:= ${LIBSMDIR}/libsm.a +LIBSMDIR= ${.OBJDIR}/../../lib/libsm +LIBSM= ${LIBSMDIR}/libsm.a DPADD= ${LIBSM} LDADD= ${LIBSM} diff --git a/libexec/smrsh/Makefile b/libexec/smrsh/Makefile index 458d93c..6fd2801 100644 --- a/libexec/smrsh/Makefile +++ b/libexec/smrsh/Makefile @@ -9,12 +9,8 @@ SRCS= smrsh.c MAN= smrsh.8 CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I. -.if exists(${.OBJDIR}/../../lib/libsm) -LIBSMDIR:= ${.OBJDIR}/../../lib/libsm -.else -LIBSMDIR!= cd ${.CURDIR}/../../lib/libsm; make -V .OBJDIR -.endif -LIBSM:= ${LIBSMDIR}/libsm.a +LIBSMDIR= ${.OBJDIR}/../../lib/libsm +LIBSM= ${LIBSMDIR}/libsm.a DPADD= ${LIBSM} LDADD= ${LIBSM} diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile index 293ecdc..68b2be6 100644 --- a/libexec/telnetd/Makefile +++ b/libexec/telnetd/Makefile @@ -19,11 +19,7 @@ CFLAGS+= -DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \ WARNS?= 2 WFORMAT?= 0 -.if exists(${.OBJDIR}/../../lib/libtelnet) LIBTELNET= ${.OBJDIR}/../../lib/libtelnet/libtelnet.a -.else -LIBTELNET= ${.CURDIR}/../../lib/libtelnet/libtelnet.a -.endif DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} LDADD= -lutil -ltermcap ${LIBTELNET} |
