On Thu, Jan 26, 2017 at 05:53:19PM +0000, Emil Velikov wrote: > From: Emil Velikov <[email protected]> > > Under normal build rules one should consider srcdir as RO, thus creating > files in srcdir is going to fail. > > This was flagged with a recent work in release.sh > > Cc: Peter Hutterer <[email protected]> > Cc: Gaetan Nadon <[email protected]> > Signed-off-by: Emil Velikov <[email protected]> > --- > xorg-macros.m4.in | 6 +++--- > xorgversion.m4 | 6 +++--- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in > index 2ed7837..675d07d 100644 > --- a/xorg-macros.m4.in > +++ b/xorg-macros.m4.in > @@ -1837,9 +1837,9 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], > AC_DEFUN([XORG_INSTALL], [ > AC_REQUIRE([PKG_PROG_PKG_CONFIG]) > macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros` > -INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && > \ > -mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \ > -|| (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \ > +INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_builddir)/.INSTALL.tmp > && \ > +mv \$(top_builddir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \
aren't you still trying to create files in srcdir here? or is there something outside the context that makes it sufficient to have .INSTALL.tmp? same below and in the next hunk Cheers, Peter > +|| (rm -f \$(top_builddir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \ > echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing > possibly empty INSTALL.' >&2)" > AC_SUBST([INSTALL_CMD]) > ]) # XORG_INSTALL > diff --git a/xorgversion.m4 b/xorgversion.m4 > index 19f2ffd..b037cb3 100644 > --- a/xorgversion.m4 > +++ b/xorgversion.m4 > @@ -56,9 +56,9 @@ AC_DEFUN([XORG_RELEASE_VERSION],[ > # > # > AC_DEFUN([XORG_CHANGELOG], [ > -CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > > \$(top_srcdir)/.changelog.tmp && \ > -mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \ > -|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \ > +CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > > \$(top_builddir)/.changelog.tmp && \ > +mv \$(top_builddir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \ > +|| (rm -f \$(top_builddir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \ > echo 'git directory not found: installing possibly empty changelog.' >&2)" > AC_SUBST([CHANGELOG_CMD]) > ]) # XORG_CHANGELOG > -- > 2.11.0 > _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
