Commit 2515ed27 authored by Christian Kellner's avatar Christian Kellner
Browse files

Fix out-of-source builds

The autogen.sh called autoconf and friends in the current working
directory and therfore couldn't find the neccessary files.
Additionally for the proper generation of gnome-battery-bench.c
we need to include the actual source dir as an source directory.

https://bugzilla.gnome.org/show_bug.cgi?id=775995
parent fa605291
......@@ -8,6 +8,9 @@ test -z "$srcdir" && srcdir=.
exit 1
}
olddir=`pwd`
cd "$srcdir"
PKG_NAME=`autoconf --trace 'AC_INIT:$1' "$srcdir/configure.ac"`
if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
......@@ -22,6 +25,8 @@ aclocal --install || exit 1
autoreconf --verbose --force --install -Wno-portability || exit 1
set +x
cd "$olddir"
if [ "$NOCONFIGURE" = "" ]; then
set -x
$srcdir/configure "$@" || exit 1
......
......@@ -71,4 +71,7 @@ EXTRA_DIST += $(ui_files)
gnome-battery-bench.gresource.c: $(ui_files)
%.gresource.c : %.gresource.xml
$(GLIB_COMPILE_RESOURCES) --generate --target $@ $<
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) \
--sourcedir="$(srcdir)" \
--generate \
--target $@ $<
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment