diff options
| -rw-r--r-- | lib/libGLw/Makefile | 19 | ||||
| -rw-r--r-- | lib/libepoxy/Makefile | 22 |
2 files changed, 13 insertions, 28 deletions
diff --git a/lib/libGLw/Makefile b/lib/libGLw/Makefile index c3cf860b3..c7d20655e 100644 --- a/lib/libGLw/Makefile +++ b/lib/libGLw/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2012/08/17 15:16:44 mpi Exp $ +# $OpenBSD: Makefile,v 1.16 2016/10/08 19:09:34 matthieu Exp $ DEBUG?= @@ -35,17 +35,12 @@ includes: beforeinstall: includes -afterinstall: glw.pc - $(INSTALL) -c -m 644 -o root -g wheel glw.pc \ - ${DESTDIR}${LIBDIR}/pkgconfig - -glw.pc: glw.pc.in - sed -e 's,@INSTALL_DIR@,$(X11BASE),' \ - -e 's,@LIB_DIR@,lib,' \ - -e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),' \ - < ${.CURDIR}/glw.pc.in > glw.pc - -NOPROFILE= +PKGCONFIG= glw.pc +PACKAGE_VERSION=$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY) +EXTRA_PKGCONFIG_SUBST= \ + -e 's,@INSTALL_DIR@,$(X11BASE),' \ + -e 's,@LIB_DIR@,lib,' \ + -e 's,@VERSION@,$(PACKAGE_VERSION),' \ .include <bsd.lib.mk> .include <bsd.xorg.mk> diff --git a/lib/libepoxy/Makefile b/lib/libepoxy/Makefile index 3986deb89..98900d7a6 100644 --- a/lib/libepoxy/Makefile +++ b/lib/libepoxy/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2016/09/01 10:37:40 jsg Exp $ +# $OpenBSD: Makefile,v 1.5 2016/10/08 19:09:34 matthieu Exp $ .include <bsd.xconf.mk> EPOXY= ${.CURDIR}/../../dist/libepoxy @@ -52,25 +52,15 @@ includes: _SUBDIRUSE NOPROFILE= +PKGCONFIG= epoxy.pc +PACKAGE_VERSION= $(EPOXY_MAJOR).$(EPOXY_MINOR).$(EPOXY_TINY) +EXTRA_PKGCONFIG_SUBST= '-e s,@DLOPEN_LIBS@,,' + obj: _xenocara_obj .include <bsd.lib.mk> .include <bsd.xorg.mk> -epoxy.pc: ${EPOXY}/epoxy.pc.in Makefile - sed -e 's,@prefix@,$(X11BASE),' \ - -e 's,@exec_prefix@,$(X11BASE),' \ - -e 's,@libdir@,${LIBDIR},' \ - -e 's,@includedir@,${INCSDIR},' \ - -e 's,@DLOPEN_LIBS@,,' \ - -e 's,@PACKAGE_VERSION@,$(EPOXY_MAJOR).$(EPOXY_MINOR),' \ - < ${EPOXY}/epoxy.pc.in > epoxy.pc - -afterinstall: epoxy.pc - $(INSTALL) -c -m 644 -o root -g wheel epoxy.pc \ - ${DESTDIR}${LIBDIR}/pkgconfig - -CLEANFILES+= epoxy.pc - +.PATH: ${EPOXY} .PATH: ${EPOXY}/src .PATH: ${.CURDIR}/generated/src |