- Patch by Patrick GOLDBRONN pgoldbronn on free.fr

          Support out of dir compilation

4 files changed, 24 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index ab56cee..f33ce02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-12-19  Bruno coudoin  <bruno.coudoin@free.fr>
+
+	- Patch by Patrick GOLDBRONN pgoldbronn on free.fr
+          Support out of dir compilation
+	
+	* Makefile.am:
+	* autogen.sh:
+	* gnome2-macros/autogen.sh:
+
 2005-12-18  Bruno coudoin  <bruno.coudoin@free.fr>
 
 	Added file headers assigning correct copyright to Frederic.
diff --git a/Makefile.am b/Makefile.am
index 18c05e4..074ba51 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,15 +34,15 @@ distcore = $(PACKAGE)-core-$(VERSION)
 
 install-data-local:
 	@$(NORMAL_INSTALL)
-	if test -d @PACKAGE_DATA_DIR@; then \
-	  $(mkinstalldirs) $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@; \
-	  cd @PACKAGE_DATA_DIR@ ; tar cf -  --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude "Makefile" --exclude "Makefile.am" --exclude CVS --exclude .xvpics --exclude "*.assetml" * | ( cd $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
+	if test -d $(srcdir)/$(PACKAGE_DATA_DIR); then \
+	  $(mkinstalldirs) $(DESTDIR)/$(pkgdatadir)/$(PACKAGE_DATA_DIR); \
+	  cd $(srcdir)/$(PACKAGE_DATA_DIR) ; tar cf -  --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude "Makefile" --exclude "Makefile.am" --exclude CVS --exclude .xvpics --exclude "*.assetml" * | ( cd $(DESTDIR)/$(pkgdatadir)/$(PACKAGE_DATA_DIR) ; tar xf -) ; cd .. ; \
 	fi
 
 dist-hook:
-	if test -d @PACKAGE_DATA_DIR@; then \
-	  $(mkinstalldirs) $(distdir)/@PACKAGE_DATA_DIR@; \
-	  cd @PACKAGE_DATA_DIR@ ; tar cf -  --exclude "Makefile.in" --exclude "Makefile" --exclude "*~" --exclude ".*" --exclude CVS --exclude .xvpics * | ( cd ../$(distdir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
+	if test -d $(PACKAGE_DATA_DIR); then \
+	  $(mkinstalldirs) $(distdir)/$(PACKAGE_DATA_DIR); \
+	  cd $(srcdir)/$(PACKAGE_DATA_DIR) ; tar cf -  --exclude "Makefile.in" --exclude "Makefile" --exclude "*~" --exclude ".*" --exclude CVS --exclude .xvpics * | ( cd ../$(distdir)/$(PACKAGE_DATA_DIR) ; tar xf -) ; cd .. ; \
 	fi
 
 
diff --git a/autogen.sh b/autogen.sh
index e538f9d..4280dee 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -14,5 +14,6 @@ PKG_NAME="gcompris"
 
 REQUIRED_AUTOMAKE_VERSION=1.6 \
 USE_GNOME2_MACROS=1 \
-BUILD_PATH="$srcdir"\
- . ./gnome2-macros/gnome-autogen.sh
+BUILD_PATH="$srcdir" \
+srcdir="$srcdir" \
+. $srcdir/gnome2-macros/gnome-autogen.sh
diff --git a/gnome2-macros/autogen.sh b/gnome2-macros/autogen.sh
index f1a0437..4d7dfd3 100644
--- a/gnome2-macros/autogen.sh
+++ b/gnome2-macros/autogen.sh
@@ -234,9 +234,11 @@ AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/`
 
 case $REQUIRED_AUTOMAKE_VERSION in
     1.4*) automake_progs="automake-1.4" ;;
-    1.5*) automake_progs="automake-1.7 automake-1.6 automake-1.5" ;;
-    1.6*) automake_progs="automake-1.7 automake-1.6" ;;
-    1.7*) automake_progs="automake-1.7" ;;
+    1.5*) automake_progs="automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
+    1.6*) automake_progs="automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
+    1.7*) automake_progs="automake-1.9 automake-1.8 automake-1.7" ;;
+    1.8*) automake_progs="automake-1.9 automake-1.8" ;;
+    1.9*) automake_progs="automake-1.9" ;;
 esac
 version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
     "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz" || DIE=1
@@ -302,6 +304,7 @@ for configure_ac in $configure_files; do
 
 	aclocalinclude="$ACLOCAL_FLAGS"
 	printbold "Running $ACLOCAL..."
+	cd $dirname
 	$ACLOCAL $aclocalinclude || exit 1
 
 	if grep "GNOME_AUTOGEN_OBSOLETE" aclocal.m4 >/dev/null; then