[src/trunk]: src/external/mit/xorg/tools/makekeys Make this work without a po...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0c64813c5b88
branches:  trunk
changeset: 339069:0c64813c5b88
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Jun 25 01:38:09 2015 +0000

description:
Make this work without a populated X11 include heirarchy.  It's ugly
but it works.

diffstat:

 external/mit/xorg/tools/makekeys/Makefile |  26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 deletions(-)

diffs (41 lines):

diff -r cb2535cbaf49 -r 0c64813c5b88 external/mit/xorg/tools/makekeys/Makefile
--- a/external/mit/xorg/tools/makekeys/Makefile Wed Jun 24 22:20:24 2015 +0000
+++ b/external/mit/xorg/tools/makekeys/Makefile Thu Jun 25 01:38:09 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2015/06/24 22:20:25 matt Exp $
+#      $NetBSD: Makefile,v 1.3 2015/06/25 01:38:09 matt Exp $
 
 NOMAN= 1
 
@@ -8,7 +8,31 @@
 
 PROG?=         makekeys
 SRCS=          makekeys.c
+.if !make(obj) && !exists(${DESTDIR}${X11INCDIR}/X.h)
+CLEANFILES+=   X11
+CPPFLAGS+=     -I.
+XPINCS=                X.h Xarch.h Xos.h Xosdefs.h keysymdef.h
+X11INCS=       Xlib.h Xresource.h
+CLEANFILES+=   ${XPINCS} ${X11INCS} Xfuncproto.h
+.BEGIN:
+       @rm -f X11 && ln -s . X11
+.for i in ${XPINCS}
+       @rm -f $i && ln -s ${X11SRCDIR.xproto}/$i .
+.endfor
+.for i in ${X11INCS}
+       @rm -f $i && ln -s ${X11SRCDIR.X11}/include/X11/$i .
+.endfor
+
+Xfuncproto.h: ${X11SRCDIR.xproto}/Xfuncproto.h.in
+       ${TOOL_SED} -e 's/#undef NARROWPROTO/#define NARROWPROTO/'  \
+           -e 's/#undef FUNCPROTO/#define FUNCPROTO 15/' \
+           < ${.ALLSRC} > ${.TARGET}
+
+makekeys.lo makekeys.o makekeys.d: Xfuncproto.h
+
+.else
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}
+.endif
 
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>