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 /lib | |
| 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 'lib')
| -rw-r--r-- | lib/Makefile | 2 | ||||
| -rw-r--r-- | lib/libss/Makefile | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/Makefile b/lib/Makefile index d511894..b102f23 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -14,7 +14,7 @@ SUBDIR+= libc libcompat libcom_err libcurses libedit \ libf2c libfakegnumalloc libftpio \ libkvm libmd libmytinfo libncurses libpcap libresolv librpcsvc \ libscsi libskey libss libtermcap libutil libxpg4 liby libipx \ - libdisk tcl + libdisk .if !exists(../secure) || defined(NOSECURE) || defined(NOCRYPT) SUBDIR+= libcrypt diff --git a/lib/libss/Makefile b/lib/libss/Makefile index 88adaaa..cebc01b 100644 --- a/lib/libss/Makefile +++ b/lib/libss/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.10 1995/08/06 12:41:07 bde Exp $ +# $Id: Makefile,v 1.11 1996/05/07 23:19:15 wosch Exp $ LIB= ss SRCS= ss_err.c data.c error.c execute_cmd.c help.c invocation.c list_rqs.c \ @@ -6,8 +6,8 @@ SRCS= ss_err.c data.c error.c execute_cmd.c help.c invocation.c list_rqs.c \ std_rqs.c CFLAGS+= -I. -I${.CURDIR} -DPOSIX -DIN_LIBSS CLEANFILES+= ss ss_err.c ss_err.h std_rqs.c -.if exists(${.CURDIR}/../libcom_err/obj/.) -LDADD+= -L${.CURDIR}/../libcom_err/obj +.if exists(${.OBJDIR}/../libcom_err) +LDADD+= -L${.OBJDIR}/../libcom_err .else LDADD+= -L${.CURDIR}/../libcom_err .endif |
