summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2018-07-19 11:58:47 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2018-07-19 11:58:47 +0000
commit815d329723295859b2676601ba459b61c23d52ef (patch)
tree59dc971f6807e95c78389fee14387122689a45aa
parent88522ed203a7329727b75203579721f37a206b32 (diff)
Remove the code that allowed to install xcbgen under /usr/X11R6/lib/
We can now use x11/py-xcbgen if needed.
-rw-r--r--proto/xcb-proto/Makefile29
1 files changed, 2 insertions, 27 deletions
diff --git a/proto/xcb-proto/Makefile b/proto/xcb-proto/Makefile
index 4b5516276..185a23be8 100644
--- a/proto/xcb-proto/Makefile
+++ b/proto/xcb-proto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2016/09/02 10:09:44 matthieu Exp $
+# $OpenBSD: Makefile,v 1.8 2018/07/19 11:58:46 matthieu Exp $
PKGCONFIG= xcb-proto.pc
@@ -37,10 +37,9 @@ FILES= \
xvmc.xml
XCBDATADIR= ${X11BASE}/share/xcb
-PYTHONDIR= ${X11BASE}/lib/python${PYTHON_VERSION}/site-packages
EXTRA_PKGCONFIG_SUBST= '-e s,@xcbincludedir@,$${datadir}/xcb,g' \
- '-e s,@pythondir@,$${prefix}/lib/python${PYTHON_VERSION}/site-packages,g'
+ '-e /^pythondir=/d'
realinstall:
@for i in ${FILES}; do \
@@ -51,28 +50,4 @@ realinstall:
eval "$$j"; \
done
-.if defined(XENOCARA_REBUILD_XCB) && ${XENOCARA_REBUILD_XCB:L} == "yes"
-
-XCBGEN_SRCS= \
- __init__.py \
- align.py \
- error.py \
- expr.py \
- matcher.py \
- state.py \
- xtypes.py
-
-install-py:
- mkdir -p ${DESTDIR}${PYTHONDIR}/xcbgen
- cd ${.CURDIR}/xcbgen ; for i in ${XCBGEN_SRCS}; do \
- ${INSTALL_DATA} $$i ${DESTDIR}${PYTHONDIR}/xcbgen; \
- done
- cd ${DESTDIR}${PYTHONDIR}/xcbgen; \
- env PYTHON=python${PYTHON_VERSION} ${SHELL} ${.CURDIR}/py-compile \
- --basedir ${PYTHONDIR}/xcbgen ${XCBGEN_SRCS}
-
-realinstall: install-py
-
-.endif
-
.include <bsd.xorg.mk>