PERFORCE change 127656 for review

[John Birrell]

http://perforce.freebsd.org/chv.cgi?CH=127656

Change 127656 by jb at jb_freebsd1 on 2007/10/18 04:43:18

	Replace references to the GNU libdwarf with the BSD one.
	
	Pass VERSION to the lib32 part of the buildworld so that
	the CTF tools can use it in there too.

Affected files ...

.. //depot/projects/dtrace/src/Makefile.inc1#31 edit

Differences ...

==== //depot/projects/dtrace/src/Makefile.inc1#31 (text+ko) ====

@@ -260,6 +260,7 @@
 # Yes, the flags are redundant.
 LIB32WMAKEENV=	MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \
 		_SHLIBDIRPREFIX=${LIB32TMP} \
+		VERSION="${VERSION}" \
 		MACHINE=i386 \
 		MACHINE_ARCH=i386 \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
@@ -893,8 +894,8 @@
 .endif
 
 .if ${MK_CDDL} != "no"
-_dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf gnu/lib/libdwarf \
-    lib/libelf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge
+_dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \
+    lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge
 .endif
 
 bootstrap-tools:
@@ -1054,7 +1055,7 @@
 		lib/libradius lib/libsbuf lib/libtacplus lib/libutil \
 		${_lib_libypclnt} lib/libz lib/msun \
 		${_secure_lib_libcrypto} ${_secure_lib_libssh} \
-		${_secure_lib_libssl} gnu/lib/libdwarf
+		${_secure_lib_libssl} lib/libdwarf
 
 .if ${MK_LIBTHR} != "no" && ${MK_LIBKSE} != "no"
 _default_thread_lib=	lib/${DEFAULT_THREAD_LIB}