diff options
| author | Mats O Jansson <maja@cvs.openbsd.org> | 1996-06-19 01:15:14 +0000 |
|---|---|---|
| committer | Mats O Jansson <maja@cvs.openbsd.org> | 1996-06-19 01:15:14 +0000 |
| commit | 21225cc5af63dd8caf644c5f6a75b632f16e51ef (patch) | |
| tree | 89895a1512972faff34daf259a0853af1d30de86 /usr.sbin/pkg_install | |
| parent | d46fa770f652a1357cf3d9b52414f221cec739f7 (diff) | |
Makefiles supported obj, but not obj.${MACHINE}. Use same solution as
eg. kerberosIV/kadm.
Diffstat (limited to 'usr.sbin/pkg_install')
| -rw-r--r-- | usr.sbin/pkg_install/add/Makefile | 8 | ||||
| -rw-r--r-- | usr.sbin/pkg_install/create/Makefile | 8 | ||||
| -rw-r--r-- | usr.sbin/pkg_install/delete/Makefile | 8 | ||||
| -rw-r--r-- | usr.sbin/pkg_install/info/Makefile | 8 |
4 files changed, 16 insertions, 16 deletions
diff --git a/usr.sbin/pkg_install/add/Makefile b/usr.sbin/pkg_install/add/Makefile index 6817ca75341..1278b7c1392 100644 --- a/usr.sbin/pkg_install/add/Makefile +++ b/usr.sbin/pkg_install/add/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.1 1996/06/04 07:56:02 niklas Exp $ +# $OpenBSD: Makefile,v 1.2 1996/06/19 01:15:11 maja Exp $ PROG= pkg_add CFLAGS+= ${DEBUG} -I${.CURDIR}/../lib -.if exists(${.CURDIR}/../lib/obj) -LDADD+= -L${.CURDIR}/../lib/obj -linstall -DPADD+= ${.CURDIR}/../lib/obj/libinstall.a +.if exists(${.CURDIR}/../lib/${__objdir}) +LDADD+= -L${.CURDIR}/../lib/${__objdir} -linstall +DPADD+= ${.CURDIR}/../lib/${__objdir}/libinstall.a .else LDADD+= -L${.CURDIR}/../lib -linstall DPADD+= ${.CURDIR}/../lib/libinstall.a diff --git a/usr.sbin/pkg_install/create/Makefile b/usr.sbin/pkg_install/create/Makefile index c5029619028..a0ef058cbf5 100644 --- a/usr.sbin/pkg_install/create/Makefile +++ b/usr.sbin/pkg_install/create/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.1 1996/06/04 07:56:05 niklas Exp $ +# $OpenBSD: Makefile,v 1.2 1996/06/19 01:15:12 maja Exp $ PROG= pkg_create CFLAGS+= ${DEBUG} -I${.CURDIR}/../lib -.if exists(${.CURDIR}/../lib/obj) -LDADD+= -L${.CURDIR}/../lib/obj -linstall -DPADD+= ${.CURDIR}/../lib/obj/libinstall.a +.if exists(${.CURDIR}/../lib/${__objdir}) +LDADD+= -L${.CURDIR}/../lib/${__objdir} -linstall +DPADD+= ${.CURDIR}/../lib/${__objdir}/libinstall.a .else LDADD+= -L${.CURDIR}/../lib -linstall DPADD+= ${.CURDIR}/../lib/libinstall.a diff --git a/usr.sbin/pkg_install/delete/Makefile b/usr.sbin/pkg_install/delete/Makefile index b612621f964..d58e24951cb 100644 --- a/usr.sbin/pkg_install/delete/Makefile +++ b/usr.sbin/pkg_install/delete/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.1 1996/06/04 07:56:07 niklas Exp $ +# $OpenBSD: Makefile,v 1.2 1996/06/19 01:15:13 maja Exp $ PROG= pkg_delete CFLAGS+= ${DEBUG} -I${.CURDIR}/../lib -.if exists(${.CURDIR}/../lib/obj) -LDADD+= -L${.CURDIR}/../lib/obj -linstall -DPADD+= ${.CURDIR}/../lib/obj/libinstall.a +.if exists(${.CURDIR}/../lib/${__objdir}) +LDADD+= -L${.CURDIR}/../lib/${__objdir} -linstall +DPADD+= ${.CURDIR}/../lib/${__objdir}/libinstall.a .else LDADD+= -L${.CURDIR}/../lib -linstall DPADD+= ${.CURDIR}/../lib/libinstall.a diff --git a/usr.sbin/pkg_install/info/Makefile b/usr.sbin/pkg_install/info/Makefile index 854b0e4a9d3..322b0f97882 100644 --- a/usr.sbin/pkg_install/info/Makefile +++ b/usr.sbin/pkg_install/info/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.1 1996/06/04 07:56:09 niklas Exp $ +# $OpenBSD: Makefile,v 1.2 1996/06/19 01:15:13 maja Exp $ PROG= pkg_info CFLAGS+= ${DEBUG} -I${.CURDIR}/../lib -.if exists(${.CURDIR}/../lib/obj) -LDADD+= -L${.CURDIR}/../lib/obj -linstall -DPADD+= ${.CURDIR}/../lib/obj/libinstall.a +.if exists(${.CURDIR}/../lib/${__objdir}) +LDADD+= -L${.CURDIR}/../lib/${__objdir} -linstall +DPADD+= ${.CURDIR}/../lib/${__objdir}/libinstall.a .else LDADD+= -L${.CURDIR}/../lib -linstall DPADD+= ${.CURDIR}/../lib/libinstall.a |