Wed Dec 3 23:17:56 2008 UTC ()
Use TOOL_AWK over hardcoded 'awk' - the latter is not good enough on Solaris


(hubertf)
diff -r1.6 -r1.7 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
cvs diff -r1.6 -r1.7 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile 2008/09/07 14:52:48 1.6
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile 2008/12/03 23:17:56 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.6 2008/09/07 14:52:48 lukem Exp $ 1# $NetBSD: Makefile,v 1.7 2008/12/03 23:17:56 hubertf Exp $
2 2
3.include <bsd.sys.mk> # for HOST_SH 3.include <bsd.sys.mk> # for HOST_SH
4 4
5.include "../../../Makefile.serverlib" 5.include "../../../Makefile.serverlib"
6.include "../../../Makefile.servermod" 6.include "../../../Makefile.servermod"
7 7
8LIB= common 8LIB= common
9 9
10.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/common 10.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/common
11SRCS.xv= xf86xv.c xf86xvmc.c 11SRCS.xv= xf86xv.c xf86xvmc.c
12 12
13SRCS.bus= xf86isaBus.c xf86pciBus.c xf86fbBus.c xf86noBus.c 13SRCS.bus= xf86isaBus.c xf86pciBus.c xf86fbBus.c xf86noBus.c
14 14
@@ -40,27 +40,27 @@ xf86Build.h: .PHONY @@ -40,27 +40,27 @@ xf86Build.h: .PHONY
40 echo "#define BUILD_DATE `date +%Y%m%d`" > ${.TARGET} 40 echo "#define BUILD_DATE `date +%Y%m%d`" > ${.TARGET}
41 41
42# We don't use DPSRCS+=xf86Build.h because we don't want the entire 42# We don't use DPSRCS+=xf86Build.h because we don't want the entire
43# library to be rebuilt each time 43# library to be rebuilt each time
44# 44#
45xf86Init.c xf86Init.o: xf86Build.h 45xf86Init.c xf86Init.o: xf86Build.h
46 46
47CLEANFILES+= xf86DefModeSet.c 47CLEANFILES+= xf86DefModeSet.c
48xf86DefModeSet.c: 48xf86DefModeSet.c:
49 ${_MKTARGET_CREATE} 49 ${_MKTARGET_CREATE}
50 cat \ 50 cat \
51 ${X11SRCDIR.xorg-server}/hw/xfree86/common/vesamodes \ 51 ${X11SRCDIR.xorg-server}/hw/xfree86/common/vesamodes \
52 ${X11SRCDIR.xorg-server}/hw/xfree86/common/extramodes | \ 52 ${X11SRCDIR.xorg-server}/hw/xfree86/common/extramodes | \
53 awk -f ${.CURDIR}/modeline2c.awk > ${.TARGET} 53 ${TOOL_AWK} -f ${.CURDIR}/modeline2c.awk > ${.TARGET}
54 54
55CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/common \ 55CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/common \
56 -I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \ 56 -I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \
57 -I${X11SRCDIR.xorg-server}/hw/xfree86/os-support/bus \ 57 -I${X11SRCDIR.xorg-server}/hw/xfree86/os-support/bus \
58 -I${X11SRCDIR.xorg-server}/mfb \ 58 -I${X11SRCDIR.xorg-server}/mfb \
59 -I${X11SRCDIR.xorg-server}/mi \ 59 -I${X11SRCDIR.xorg-server}/mi \
60 -I${X11SRCDIR.xorg-server}/include \ 60 -I${X11SRCDIR.xorg-server}/include \
61 -I${X11SRCDIR.xorg-server}/os \ 61 -I${X11SRCDIR.xorg-server}/os \
62 -I${X11SRCDIR.xorg-server}/Xext \ 62 -I${X11SRCDIR.xorg-server}/Xext \
63 -I${DESTDIR}${X11INCDIR}/X11 \ 63 -I${DESTDIR}${X11INCDIR}/X11 \
64 -I${DESTDIR}${X11INCDIR}/X11/extensions \ 64 -I${DESTDIR}${X11INCDIR}/X11/extensions \
65 -I${DESTDIR}${X11INCDIR}/pixman-1 \ 65 -I${DESTDIR}${X11INCDIR}/pixman-1 \
66 -I${DESTDIR}${X11INCDIR}/xorg \ 66 -I${DESTDIR}${X11INCDIR}/xorg \