[gnome-panel] build: fix builddir != srcdir



commit dd99cb3312350db1dca722081e3a040a2b5ce45a
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Tue May 31 19:03:08 2016 +0300

    build: fix builddir != srcdir

 Makefile.am |    2 +-
 autogen.sh  |    5 +++++
 2 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 28b0066..d33312c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,7 @@ MAINTAINERCLEANFILES = \
        $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
        $(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \
        $(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \
-       `find "m4" -type f -name "*.m4" -print` \
+       `find "$(srcdir)/m4" -type f -name "*.m4" -print` \
        $(srcdir)/INSTALL \
        $(srcdir)/config.h.in~ \
        $(srcdir)/configure \
diff --git a/autogen.sh b/autogen.sh
index 7347dad..5133615 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -11,6 +11,9 @@ if [ ! -f $srcdir/configure.ac ]; then
   exit 1
 fi
 
+olddir=$(pwd)
+cd "$srcdir"
+
 PKG_NAME=$(autoconf --trace 'AC_INIT:$1' "$srcdir/configure.ac")
 
 if [ "$#" = 0 ] && [ -z "$NOCONFIGURE" ]; then
@@ -27,6 +30,8 @@ intltoolize --force --copy --automake || exit 1
 autoreconf --verbose --force --install -Wno-portability || exit 1
 { set +x; } 2>/dev/null
 
+cd "$olddir"
+
 if [ -z "$NOCONFIGURE" ]; then
   set -x
   $srcdir/configure "$@" || exit 1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]