diff options
| author | Albert Astals Cid <tsdgeos@bluebox.localdomain> | 2007-10-22 23:33:03 +0200 |
|---|---|---|
| committer | Albert Astals Cid <tsdgeos@bluebox.localdomain> | 2007-10-22 23:33:03 +0200 |
| commit | b90a6d636f936c82b18dd00d7a8c2d349734366f (patch) | |
| tree | 71a67ba811cf197b21677420e6ef04958047a9b4 | |
| parent | ff796c400a7ffda843b0e5604a2b0b20708497ce (diff) | |
builddir != srcdir fixes by Christian Persch <chpe gnome org>
| -rwxr-xr-x | autogen.sh | 7 | ||||
| -rw-r--r-- | glib/demo/Makefile.am | 1 |
2 files changed, 5 insertions, 3 deletions
@@ -2,6 +2,7 @@ # Package name PKG_NAME=${PKG_NAME:-Poppler} +srcdir=$(dirname $0) # Default version requirements REQUIRED_GTK_DOC_VERSION=${REQUIRED_GTK_DOC_VERSION:-1.0} @@ -113,11 +114,11 @@ fi version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \ "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz" || DIE=1 -autoreconf -v -i +(cd $srcdir && autoreconf -v -i ) if $want_gtk_doc; then printbold "Running $GTKDOCIZE..." - $GTKDOCIZE --copy || exit 1 + (cd $srcdir && $GTKDOCIZE --copy) || exit 1 fi -./configure $@ +$srcdir/configure $@ diff --git a/glib/demo/Makefile.am b/glib/demo/Makefile.am index d07b1c6f..9fa5cca2 100644 --- a/glib/demo/Makefile.am +++ b/glib/demo/Makefile.am @@ -1,5 +1,6 @@ INCLUDES = \ -I$(top_srcdir)/glib \ + -I$(top_builddir)/glib \ $(GTK_TEST_CFLAGS) if BUILD_GTK_TEST |