diff options
author | jkh <jkh@FreeBSD.org> | 1996-10-06 12:43:14 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1996-10-06 12:43:14 +0000 |
commit | 759a48eac3e0f9da7976dd961d6205fac5c3dbfc (patch) | |
tree | 0064f431835c87ed8bbc5088776358a269d4ab62 /usr.bin | |
parent | 34ce673255e7f6451ae89c479c3fe854ed85334a (diff) | |
download | FreeBSD-src-759a48eac3e0f9da7976dd961d6205fac5c3dbfc.zip FreeBSD-src-759a48eac3e0f9da7976dd961d6205fac5c3dbfc.tar.gz |
Correct merge bogon: You want to descend into PSD.doc for both `all' and
`install' cases or there's never anything made to install, and you blow
up in the install. :-)
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/make/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile index df3b43f..d1953ac 100644 --- a/usr.bin/make/Makefile +++ b/usr.bin/make/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 5.2 (Berkeley) 12/28/90 -# $Id: Makefile,v 1.5 1995/09/22 14:14:28 phk Exp $ +# $Id: Makefile,v 1.6 1996/10/06 02:33:53 steve Exp $ PROG= make CFLAGS+= -I${.CURDIR} @@ -12,7 +12,7 @@ SRCS+= lstAppend.c lstAtEnd.c lstAtFront.c lstClose.c lstConcat.c \ lstMember.c lstNext.c lstOpen.c lstRemove.c lstReplace.c lstSucc.c .PATH: ${.CURDIR}/lst.lib -.if make(install) +.if make (all) || make(install) SUBDIR+= PSD.doc .endif |