Fix conditional that had two &&'s so that make release
authorRobert Garrett <rob@dragonflybsd.org>
Tue, 5 Aug 2003 17:11:04 +0000 (17:11 +0000)
committerRobert Garrett <rob@dragonflybsd.org>
Tue, 5 Aug 2003 17:11:04 +0000 (17:11 +0000)
will work.
--Needed for RCng testing.

release/Makefile
usr.sbin/pppd/Makefile

index 3563b9b..b892a90 100644 (file)
@@ -1,5 +1,5 @@
 # $FreeBSD: src/release/Makefile,v 1.536.2.110 2003/05/10 23:01:29 murray Exp $
-# $DragonFly: src/release/Attic/Makefile,v 1.3 2003/08/05 07:45:41 asmodai Exp $
+# $DragonFly: src/release/Attic/Makefile,v 1.4 2003/08/05 17:11:04 rob Exp $
 #
 # make release CHROOTDIR=/some/dir BUILDNAME=somename CVSROOT=/cvs/dir \
 #      [ RELEASETAG=tag ]
@@ -29,7 +29,7 @@ DATE != date +%Y%m%d
 BASE = 4.8
 BUILDNAME?=${BASE}-${DATE}-STABLE
 #
-#CHROOTDIR=/junk/release
+CHROOTDIR=/storage/build/
 # If this is a -stable snapshot, then set
 #RELEASETAG=RELENG_4
 # If you want to add other options to CVS commands, then set
@@ -91,8 +91,8 @@ NOPORTREADMES?=       YES
 #
 # Setting this also disables building of release note documentation
 # (RELNOTESng).
-#NODOC=  YES
-#NOPORTS=  YES
+NODOC=  YES
+NOPORTS=  YES
 
 # Modify this definition if you want the release notes 
 # and other release documentation in a language other than English.
index 1cd488a..d5f8c55 100644 (file)
@@ -1,5 +1,5 @@
 # $FreeBSD: src/usr.sbin/pppd/Makefile,v 1.19.2.2 2001/08/19 03:32:43 kris Exp $
-# $DragonFly: src/usr.sbin/pppd/Makefile,v 1.3 2003/08/03 16:45:16 dillon Exp $
+# $DragonFly: src/usr.sbin/pppd/Makefile,v 1.4 2003/08/05 17:11:04 rob Exp $
 
 CFLAGS+= -DHAVE_PATHS_H
 
@@ -31,7 +31,7 @@ LDADD+=       -lpcap
 DPADD+=        ${LIBPCAP}
 
 # MS-CHAP support.  Requires the DES library.
-.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
+.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT)  && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
 DISTRIBUTION=crypto
 CFLAGS+=-DCHAPMS
 SRCS+= chap_ms.c