Tue Dec 25 08:59:06 2018 UTC ()
Remove duplicate INCSDIR


(maya)
diff -r1.3 -r1.4 src/external/mit/xorg/lib/libxkbfile/Makefile
cvs diff -r1.3 -r1.4 src/external/mit/xorg/lib/libxkbfile/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/lib/libxkbfile/Makefile 2008/11/06 22:28:26 1.3
+++ src/external/mit/xorg/lib/libxkbfile/Makefile 2018/12/25 08:59:06 1.4
@@ -1,25 +1,23 @@ @@ -1,25 +1,23 @@
1# $NetBSD: Makefile,v 1.3 2008/11/06 22:28:26 veego Exp $ 1# $NetBSD: Makefile,v 1.4 2018/12/25 08:59:06 maya Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5LIB= xkbfile 5LIB= xkbfile
6.PATH: ${X11SRCDIR.${LIB}}/src 6.PATH: ${X11SRCDIR.${LIB}}/src
7.PATH: ${X11SRCDIR.${LIB}}/include/X11/extensions 7.PATH: ${X11SRCDIR.${LIB}}/include/X11/extensions
8 8
9SRCS= cout.c maprules.c srvmisc.c xkbatom.c xkbbells.c xkbconfig.c \ 9SRCS= cout.c maprules.c srvmisc.c xkbatom.c xkbbells.c xkbconfig.c \
10 xkbdraw.c xkberrs.c xkbmisc.c xkbout.c xkbtext.c xkmout.c \ 10 xkbdraw.c xkberrs.c xkbmisc.c xkbout.c xkbtext.c xkmout.c \
11 xkmread.c 11 xkmread.c
12 12
13CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/extensions 13CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/extensions
14 14
15INCSDIR=${X11INCDIR}/X11/extensions 
16 
17INCS= XKBbells.h XKBconfig.h XKBfile.h XKBrules.h XKM.h XKMformat.h 15INCS= XKBbells.h XKBconfig.h XKBfile.h XKBrules.h XKM.h XKMformat.h
18INCSDIR=${X11INCDIR}/X11/extensions 16INCSDIR=${X11INCDIR}/X11/extensions
19 17
20LIBDPLIBS= X11 ${.CURDIR}/../libX11/dynamic 18LIBDPLIBS= X11 ${.CURDIR}/../libX11/dynamic
21 19
22PKGCONFIG= xkbfile 20PKGCONFIG= xkbfile
23 21
24.include <bsd.x11.mk> 22.include <bsd.x11.mk>
25.include <bsd.lib.mk> 23.include <bsd.lib.mk>