qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

simplify directory interdependencies: install package_version.m4

Browse Source 
avoid VAR != cmd which is run every which time, prefer VAR = `cmd` where
applicable.

okay matthieu@
This commit is contained in:
espie 2012-11-03 15:19:02 +00:00
parent 3aab93968b
commit e3816905af
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
share/mk/Makefile
View File

@ -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:

9
share/mk/bsd.xorg.mk
View File

@ -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} \
< $? > $@