hopefully fixed all configure problems now

SVN-Revision: 1399

diff --git a/.cvsignore b/.cvsignore
new file mode 100644 (file)
index 0000000..5a11bab
--- /dev/null
+++ b/.cvsignore
@@ -0,0 +1,13 @@
+Makefile.in
+aclocal.m4
+config.log
+config.status
+config.guess
+config.rpath
+config.sub
+configure
+depcomp
+install-sh
+missing
+mkinstalldirs
+

diff --git a/ChangeLog b/ChangeLog
index 20a6c95..c950a94 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2004-06-02  gettextize  <bug-gnu-gettext@gnu.org>
+
+       * Makefile.am (SUBDIRS): Add intl,
+       (EXTRA_DIST): Add config.rpath mkinstalldirs.
+       * configure.ac (AC_OUTPUT): Add intl/Makefile,
+
+2004-06-02  gettextize  <bug-gnu-gettext@gnu.org>
+
+       * Makefile.am (EXTRA_DIST): Add config.rpath mkinstalldirs.
+
+2004-06-02  gettextize  <bug-gnu-gettext@gnu.org>
+
+       * Makefile.am (EXTRA_DIST): Add config.rpath.
+
+2004-06-02  gettextize  <bug-gnu-gettext@gnu.org>
+
+       * Makefile.am (SUBDIRS): Add m4.
+       (ACLOCAL_AMFLAGS): New variable.
+       (EXTRA_DIST): Add config.rpath.
+       * configure.ac (AC_OUTPUT): Add po/Makefile.in,
+
 - SuperTux changes -
 http://super-tux.sf.net/
 

diff --git a/Makefile.am b/Makefile.am
index e119f0e..449a573 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,3 @@
-SUBDIRS = src data
-
-EXTRA_DIST = LEVELDESIGN TODO contrib/levelconverter-0.0.6_0.0.7.py $(wildcard mk/autoconf/*.m4) autogen.sh
-
-# EOF #
+SUBDIRS = intl m4 src data po
+EXTRA_DIST = config.rpath mkinstalldirs  config.rpath mkinstalldirs  config.rpath  config.rpath  LEVELDESIGN TODO contrib/levelconverter-0.0.6_0.0.7.py autogen.sh
+ACLOCAL_AMFLAGS = -I m4

diff --git a/autogen.sh b/autogen.sh
index f9a92f0..7e64cbd 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,7 +3,7 @@
 # we need a minimum of automake 1.6 and automake 1.8 seems to be buggy
 export WANT_AUTOMAKE=1.6
 
-aclocal -I mk/autoconf
+aclocal -I m4
 automake --copy --add-missing
 autoconf
 

diff --git a/data/.cvsignore b/data/.cvsignore
new file mode 100644 (file)
index 0000000..282522d
--- /dev/null
+++ b/data/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

diff --git a/intl/.cvsignore b/intl/.cvsignore
new file mode 100644 (file)
index 0000000..550bd25
--- /dev/null
+++ b/intl/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+

diff --git a/m4/.cvsignore b/m4/.cvsignore
new file mode 100644 (file)
index 0000000..22a4e72
--- /dev/null
+++ b/m4/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+

diff --git a/po/.cvsignore b/po/.cvsignore
new file mode 100644 (file)
index 0000000..2bfb3bd
--- /dev/null
+++ b/po/.cvsignore
@@ -0,0 +1,6 @@
+Makefile
+Makefile.in
+POTFILES
+*.gmo
+stamp-po
+

diff --git a/src/.cvsignore b/src/.cvsignore
new file mode 100644 (file)
index 0000000..bbf2c2f
--- /dev/null
+++ b/src/.cvsignore
@@ -0,0 +1,6 @@
+.deps
+Makefile
+Makefile.in
+supertux
+supertux.exe
+