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

Don't touch the xserver autotools files a 2nd time in kdrive.

Browse Source 
This causes a rebuild of xserver during make release (configure
becomes more recent than config.status again).
This commit is contained in:
matthieu 2012-08-08 21:54:33 +00:00
parent 143961ca76
commit 40b3c07678
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kdrive/Makefile.bsd-wrapper
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.14 2012/06/10 13:21:32 matthieu Exp $
# $OpenBSD: Makefile.bsd-wrapper,v 1.15 2012/08/08 21:54:33 matthieu Exp $
.include <bsd.xconf.mk>
_SRCDIR= ${.CURDIR}/../xserver
NO_REORDER=yes
XKB_PATH= ${X11BASE}/share/X11/xkb
XKB_RULES= base

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

@ -1,4 +1,4 @@
# $OpenBSD: bsd.xorg.mk,v 1.43 2012/08/05 18:08:05 matthieu Exp $ -*- makefile -*-
# $OpenBSD: bsd.xorg.mk,v 1.44 2012/08/08 21:54:33 matthieu Exp $ -*- makefile -*-
#
# Copyright © 2006,2012 Matthieu Herrb
#
@ -155,6 +155,7 @@ config.status:
.if defined(XENOCARA_RERUN_AUTOCONF) && ${XENOCARA_RERUN_AUTOCONF:L} == "yes"
cd ${_SRCDIR}; ${AUTOTOOLS_ENV} exec autoreconf -v --install --force
.else
.if !defined(NO_REORDER)
@sed -e '/^#/d' ${REORDER_DEPENDENCIES} | \
tsort -r|while read f; do \
cd ${_SRCDIR}; \
@ -169,6 +170,7 @@ config.status:
fi \
;; \
esac; done
.endif
.endif
${CONFIGURE_ENV} PATH=$(XENOCARA_PATH) \
exec sh ${_SRCDIR}/configure --prefix=${X11BASE} \