Module Name:src
Committed By: matt
Date: Thu Jun 25 01:38:09 UTC 2015
Modified Files:
src/external/mit/xorg/tools/makekeys: Makefile
Log Message:
Make this work without a populated X11 include heirarchy. It's ugly
but it works.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/tools/makekeys/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/tools/makekeys/Makefile
diff -u src/external/mit/xorg/tools/makekeys/Makefile:1.2 src/external/mit/xorg/tools/makekeys/Makefile:1.3
--- src/external/mit/xorg/tools/makekeys/Makefile:1.2 Wed Jun 24 22:20:25 2015
+++ src/external/mit/xorg/tools/makekeys/Makefile Thu Jun 25 01:38:09 2015
@@ -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 @@ NOMAN= 1
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
