diff options
| author | jkh <jkh@FreeBSD.org> | 1996-06-24 04:26:21 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1996-06-24 04:26:21 +0000 |
| commit | 8eb37231d4405088a481324c2ec41ac851e8d8f7 (patch) | |
| tree | dc80da53186aab7c56424c2574b0cd7928930721 /usr.sbin/pkg_install | |
| parent | 3acbd3cce674dab9a0afdee1f6e50196f4585ffa (diff) | |
| download | FreeBSD-src-8eb37231d4405088a481324c2ec41ac851e8d8f7.zip FreeBSD-src-8eb37231d4405088a481324c2ec41ac851e8d8f7.tar.gz | |
Bring in my changes for removing the pestilent obj links (unless you
really want them) from /usr/src. This is the final version of the
patches, incorporating the feedback I've received from -current.
Diffstat (limited to 'usr.sbin/pkg_install')
| -rw-r--r-- | usr.sbin/pkg_install/add/Makefile | 6 | ||||
| -rw-r--r-- | usr.sbin/pkg_install/create/Makefile | 6 | ||||
| -rw-r--r-- | usr.sbin/pkg_install/delete/Makefile | 6 | ||||
| -rw-r--r-- | usr.sbin/pkg_install/info/Makefile | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/usr.sbin/pkg_install/add/Makefile b/usr.sbin/pkg_install/add/Makefile index ade7e57..723ca45 100644 --- a/usr.sbin/pkg_install/add/Makefile +++ b/usr.sbin/pkg_install/add/Makefile @@ -2,9 +2,9 @@ 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(${.OBJDIR}/../lib) +LDADD+= -L${.OBJDIR}/../lib -linstall +DPADD+= ${.OBJDIR}/../lib/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 fda22e7..26d57e4 100644 --- a/usr.sbin/pkg_install/create/Makefile +++ b/usr.sbin/pkg_install/create/Makefile @@ -2,9 +2,9 @@ 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(${.OBJDIR}/../lib) +LDADD+= -L${.OBJDIR}/../lib -linstall +DPADD+= ${.OBJDIR}/../lib/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 38c6802..9fd0980 100644 --- a/usr.sbin/pkg_install/delete/Makefile +++ b/usr.sbin/pkg_install/delete/Makefile @@ -1,9 +1,9 @@ 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(${.OBJDIR}/../lib) +LDADD+= -L${.OBJDIR}/../lib -linstall +DPADD+= ${.OBJDIR}/../lib/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 8c5098c..9ab8dc3 100644 --- a/usr.sbin/pkg_install/info/Makefile +++ b/usr.sbin/pkg_install/info/Makefile @@ -1,9 +1,9 @@ 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(${.OBJDIR}/../lib) +LDADD+= -L${.OBJDIR}/../lib -linstall +DPADD+= ${.OBJDIR}/../lib/libinstall.a .else LDADD+= -L${.CURDIR}/../lib -linstall DPADD+= ${.CURDIR}/../lib/libinstall.a |
