summaryrefslogtreecommitdiffstats
path: root/usr.sbin/pkg_install
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2005-06-10 06:12:53 +0000
committerdes <des@FreeBSD.org>2005-06-10 06:12:53 +0000
commit2bb8de20fe30f1cc02ae127bd04e473b19e23441 (patch)
tree086bc6374cc176de9e2533a2b8b25ab0ef497b15 /usr.sbin/pkg_install
parent508e67396ea922c5e3249f730d7004fa6edba0b2 (diff)
downloadFreeBSD-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 'usr.sbin/pkg_install')
-rw-r--r--usr.sbin/pkg_install/Makefile.inc8
1 files changed, 1 insertions, 7 deletions
diff --git a/usr.sbin/pkg_install/Makefile.inc b/usr.sbin/pkg_install/Makefile.inc
index 46518b9..e27d31a 100644
--- a/usr.sbin/pkg_install/Makefile.inc
+++ b/usr.sbin/pkg_install/Makefile.inc
@@ -1,10 +1,6 @@
# $FreeBSD$
-.if exists(${.OBJDIR}/../lib)
LIBINSTALL= ${.OBJDIR}/../lib/libinstall.a
-.else
-LIBINSTALL= ${.CURDIR}/../lib/libinstall.a
-.endif
.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && \
defined(LDADD) && ${LDADD:M-lfetch} != ""
@@ -13,6 +9,4 @@ LDADD+= -lssl -lcrypto
.endif
# Inherit BINDIR from one level up.
-.if exists(${.CURDIR}/../../Makefile.inc)
-.include "${.CURDIR}/../../Makefile.inc"
-.endif
+.include "../Makefile.inc"
OpenPOWER on IntegriCloud