diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2012-11-03 15:19:03 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2012-11-03 15:19:03 +0000 |
| commit | 3d32442c43a34a954783ee6cc7f24db153a33a36 (patch) | |
| tree | c656f0f6d7cd3116d40bbad77db15972fb16ba54 | |
| parent | 449353760a74bcadd0704b495d89766a3a1844f1 (diff) | |
simplify directory interdependencies: install package_version.m4
avoid VAR != cmd which is run every which time, prefer VAR = `cmd` where
applicable.
okay matthieu@
| -rw-r--r-- | share/mk/Makefile | 4 | ||||
| -rw-r--r-- | share/mk/bsd.xorg.mk | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/share/mk/Makefile b/share/mk/Makefile index 7c6723e2e..e517288a9 100644 --- a/share/mk/Makefile +++ b/share/mk/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.5 2010/05/08 21:09:51 matthieu Exp $ +# $OpenBSD: Makefile,v 1.6 2012/11/03 15:19:02 espie Exp $ .include <bsd.own.mk> -FILES= automake.dep bsd.xconf.mk bsd.xorg.mk +FILES= automake.dep bsd.xconf.mk bsd.xorg.mk package_version.m4 all: diff --git a/share/mk/bsd.xorg.mk b/share/mk/bsd.xorg.mk index 250abcbcd..d796cba48 100644 --- a/share/mk/bsd.xorg.mk +++ b/share/mk/bsd.xorg.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.xorg.mk,v 1.46 2012/10/11 16:57:57 espie Exp $ -*- makefile -*- +# $OpenBSD: bsd.xorg.mk,v 1.47 2012/11/03 15:19:02 espie Exp $ -*- makefile -*- # # Copyright © 2006,2012 Matthieu Herrb # @@ -72,9 +72,8 @@ AUTOTOOLS_ENV= AUTOMAKE_VERSION="$(AUTOMAKE_VERSION)" \ # pkgconfig .if defined(PKGCONFIG) -.if !defined(PACKAGE_VERSION) -PACKAGE_VERSION!=m4 ${XSRCDIR}/share/mk/package_version.m4 ${_SRCDIR}/configure.ac -.endif + +PACKAGE_VERSION ?= `m4 ${DESTDIR}${X11BASE}/share/mk/package_version.m4 ${_SRCDIR}/configure.ac` all: ${PKGCONFIG} @@ -85,7 +84,7 @@ ${PKGCONFIG}: ${PKGCONFIG}.in -e 's#@exec_prefix@#$${prefix}#g' \ -e 's#@libdir@#$${exec_prefix}/lib#g' \ -e 's#@includedir@#$${prefix}/include#g' \ - -e 's#@PACKAGE_VERSION@#${PACKAGE_VERSION}#g' \ + -e 's#@PACKAGE_VERSION@#'${PACKAGE_VERSION}'#g' \ ${EXTRA_PKGCONFIG_SUBST} \ < $? > $@ |