PERFORCE change 127858 for review
John Birrell
jb at FreeBSD.org
Sat Oct 20 15:55:23 PDT 2007
http://perforce.freebsd.org/chv.cgi?CH=127858
Change 127858 by jb at jb_freebsd8 on 2007/10/20 22:54:24
Fix typos.
Affected files ...
.. //depot/projects/dtrace6/src/Makefile.inc1#3 edit
.. //depot/projects/dtrace6/src/cddl/lib/Makefile#2 edit
.. //depot/projects/dtrace6/src/include/Makefile#3 edit
Differences ...
==== //depot/projects/dtrace6/src/Makefile.inc1#3 (text+ko) ====
@@ -50,7 +50,7 @@
.if !defined(NO_GAMES)
SUBDIR+=games
.endif
-.if !define(NO_CDDL)
+.if !defined(NO_CDDL)
SUBDIR+=cddl
.else
NO_CTF=1
@@ -242,7 +242,7 @@
VERSION="${VERSION}" \
INSTALL="sh ${.CURDIR}/tools/install.sh" \
PATH=${TMPPATH}
-.if define(NO_CDDL)
+.if defined(NO_CDDL)
WMAKEENV+= NO_CTF=1
.endif
WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP}
@@ -451,7 +451,7 @@
.for _t in obj includes
cd ${.CURDIR}/include; ${LIB32WMAKE} ${_t}
cd ${.CURDIR}/lib; ${LIB32WMAKE} ${_t}
-.if !define(NO_CDDL)
+.if !defined(NO_CDDL)
cd ${.CURDIR}/cddl/lib; ${LIB32WMAKE} ${_t}
.endif
cd ${.CURDIR}/gnu/lib; ${LIB32WMAKE} ${_t}
@@ -865,7 +865,7 @@
_pwd_mkdb= usr.sbin/pwd_mkdb
.endif
-.if !define(NO_CDDL)
+.if !defined(NO_CDDL)
_dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \
lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge
.endif
@@ -1039,7 +1039,7 @@
_generic_libs+= lib
-.if !define(NO_CDDL)
+.if !defined(NO_CDDL)
_cddl_lib= cddl/lib
.endif
==== //depot/projects/dtrace6/src/cddl/lib/Makefile#2 (text+ko) ====
@@ -5,7 +5,6 @@
SUBDIR= libavl \
libctf \
libdtrace \
- libproc \
- libumem
+ libproc
.include <bsd.subdir.mk>
==== //depot/projects/dtrace6/src/include/Makefile#3 (text+ko) ====
@@ -5,7 +5,7 @@
CLEANFILES= osreldate.h version vers.c
SUBDIR= arpa protocols rpcsvc rpc
-INCS= a.out.h alloca.h ar.h assert.h bitstring.h complex.h cpio.h _ctype.h
+INCS= a.out.h alloca.h ar.h assert.h bitstring.h complex.h cpio.h _ctype.h \
ctype.h db.h \
dirent.h dlfcn.h elf.h elf-hints.h err.h fmtmsg.h fnmatch.h fstab.h \
fts.h ftw.h getopt.h glob.h grp.h \
More information about the p4-projects
mailing list