From c930eefeeada9a9a820d650fcc3481709d9d070b Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sun, 12 Jun 2016 10:31:29 +0100 Subject: [PATCH] autogen.sh: rely on VPATH for submodules' Makefile-*.am.inc This avoids hard-coding the autogen-time ${srcdir} into our build system, and might fix "make distcheck". We don't need to specify ${srcdir} explicitly in the various variables, because Automake always uses make's VPATH feature to look in both ${builddir} and ${srcdir} at build time. Signed-off-by: Simon McVittie Closes: #337 Approved by: cgwalters --- autogen.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autogen.sh b/autogen.sh index 0eb65550..581f3dee 100755 --- a/autogen.sh +++ b/autogen.sh @@ -33,8 +33,8 @@ if ! test -f libglnx/README.md || ! test -f bsdiff/README.md; then git submodule update --init fi # Workaround automake bug with subdir-objects and computed paths -sed -e 's,$(libglnx_srcpath),'${srcdir}/libglnx,g < libglnx/Makefile-libglnx.am >libglnx/Makefile-libglnx.am.inc -sed -e 's,$(libbsdiff_srcpath),'${srcdir}/bsdiff,g < bsdiff/Makefile-bsdiff.am >bsdiff/Makefile-bsdiff.am.inc +sed -e 's,$(libglnx_srcpath),libglnx,g' < libglnx/Makefile-libglnx.am >libglnx/Makefile-libglnx.am.inc +sed -e 's,$(libbsdiff_srcpath),bsdiff,g' < bsdiff/Makefile-bsdiff.am >bsdiff/Makefile-bsdiff.am.inc autoreconf --force --install --verbose