PERFORCE change 104135 for review

[John Birrell]

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

Change 104135 by jb at jb_freebsd2 on 2006/08/15 21:33:59

	Use FreeBSD's libelf now.
	
	Also ignore those Solaris #pragma ident statements that I am so
	fond of.

Affected files ...

.. //depot/projects/dtrace/src/cddl/usr.sbin/dtrace/Makefile#6 edit

Differences ...

==== //depot/projects/dtrace/src/cddl/usr.sbin/dtrace/Makefile#6 (text+ko) ====

@@ -8,7 +8,7 @@
 
 SRCS=		dtrace.c
 
-WARNS?=		1
+WARNS=		1
 
 CFLAGS+=	-I${.CURDIR}/../../../contrib \
 		-I${.CURDIR}/../../../sys/contrib \
@@ -26,15 +26,10 @@
 		-L${.OBJDIR}/../../lib/libdtrace \
 		-L${.OBJDIR}/../../lib/libproc \
 		-L${.OBJDIR}/../../lib/libctf \
-		-L${.OBJDIR}/../../lib/libelf
+		-L${.OBJDIR}/../../../lib/libelf
 
 LDADD+=		-ldtrace -ly -ll -lproc -lctf -lelf -lz
 
-.if ${MACHINE_ARCH} != "i386"
-LDFLAGS+=	-L/usr/local/lib
-LDADD+=		-lintl -liconv
-.endif
-
 #DPADD+= ${LIBDTRACE} ${LIBPTHREAD} ${LIBL} ${LIBY} ${LIBZ}
 
 NO_MAN=