summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2012-11-07 15:50:23 +0000
committerMarc Espie <espie@cvs.openbsd.org>2012-11-07 15:50:23 +0000
commit2bdddb98b0414171a86e418e8caaafa2b68b7a9b (patch)
tree53c190786a6e9328c38fcf9b2e3997eac2808c17
parente905c0df05a43abb10b0d92b2647bf8f4aad7809 (diff)
don't reach out in another src directory, use installed version.
okay matthieu@
-rw-r--r--lib/libxcb/Makefile.inc4
-rw-r--r--lib/xcb-util/Makefile.inc4
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/libxcb/Makefile.inc b/lib/libxcb/Makefile.inc
index e6e4e45e9..0466a651e 100644
--- a/lib/libxcb/Makefile.inc
+++ b/lib/libxcb/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.7 2009/10/03 13:57:56 matthieu Exp $
+# $OpenBSD: Makefile.inc,v 1.8 2012/11/07 15:50:22 espie Exp $
LIBXCB= ${.CURDIR}/../../../dist/libxcb
@@ -23,4 +23,4 @@ HEADERS_SUBDIR= xcb/
_SRCDIR?= ${.CURDIR}/../src
-PACKAGE_VERSION!=m4 ${.CURDIR}/../../../share/mk/package_version.m4 ${LIBXCB}/configure.ac
+PACKAGE_VERSION = `m4 ${DESTDIR}${X11BASE}/share/mk/package_version.m4 ${LIBXCB}/configure.ac`
diff --git a/lib/xcb-util/Makefile.inc b/lib/xcb-util/Makefile.inc
index 6c500009a..d368fb5ac 100644
--- a/lib/xcb-util/Makefile.inc
+++ b/lib/xcb-util/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.5 2009/10/03 13:57:56 matthieu Exp $
+# $OpenBSD: Makefile.inc,v 1.6 2012/11/07 15:50:22 espie Exp $
XCBUTIL= ${.CURDIR}/../../../dist/xcb-util
@@ -22,4 +22,4 @@ LDADD?= `pkg-config --libs xcb`
.PATH: ${XCBUTIL}/${SUBLIB}
-PACKAGE_VERSION!=m4 ${.CURDIR}/../../../share/mk/package_version.m4 ${XCBUTIL}/configure.ac
+PACKAGE_VERSION =`m4 ${DESTDIR}${X11BASE}/share/mk/package_version.m4 ${XCBUTIL}/configure.ac`