diff options
| author | Rodney Dawes <dobey@ximian.com> | 2004-06-10 18:24:35 +0000 |
|---|---|---|
| committer | Rodney Dawes <dobey@src.gnome.org> | 2004-06-10 18:24:35 +0000 |
| commit | a7681fc4eecc077d37ac32405f1dd21b96b186ef (patch) | |
| tree | 8f8768fd31766b102a6f298a165ef48c0bda82bb | |
| parent | b5d3f674c694bf1a1a31ba0470aedb4a76da050f (diff) | |
| download | gnome-common-a7681fc4eecc077d37ac32405f1dd21b96b186ef.tar.gz | |
Add code to check for mkinstalldirs in the shared automake files
2004-06-10 Rodney Dawes <dobey@ximian.com>
* macros2/gnome-autogen.sh: Add code to check for mkinstalldirs in
the shared automake files directory, and copy it in if we are using
AM_GLIB_GNU_GETTEXT
Fixes #144069
CVS: ----------------------------------------------------------------------
svn path=/trunk/; revision=3451
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | macros2/gnome-autogen.sh | 10 |
2 files changed, 18 insertions, 0 deletions
@@ -1,3 +1,11 @@ +2004-06-10 Rodney Dawes <dobey@ximian.com> + + * macros2/gnome-autogen.sh: Add code to check for mkinstalldirs in + the shared automake files directory, and copy it in if we are using + AM_GLIB_GNU_GETTEXT + + Fixes #144069 + 2004-05-26 James Henstridge <james@daa.com.au> * macros2/gnome-compiler-warnings.m4: some small cleanups. diff --git a/macros2/gnome-autogen.sh b/macros2/gnome-autogen.sh index 1f3414e..05f001b 100644 --- a/macros2/gnome-autogen.sh +++ b/macros2/gnome-autogen.sh @@ -270,6 +270,11 @@ version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \ "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz" || DIE=1 ACLOCAL=`echo $AUTOMAKE | sed s/automake/aclocal/` +# We need to do this for the craaaaaaazy mkinstalldirs usage of glib-gettext +AUTOMAKE_VERSION=`echo $AUTOMAKE | sed s/automake-//` +ACLOCAL_DIR=`$ACLOCAL --print-ac-dir` +AUTOMAKE_DIR=`echo $ACLOCAL_DIR | sed s/aclocal/automake-$AUTOMAKE_VERSION/` + if $want_libtool; then version_check libtool LIBTOOLIZE libtoolize $REQUIRED_LIBTOOL_VERSION \ "http://ftp.gnu.org/pub/gnu/libtool/libtool-$REQUIRED_LIBTOOL_VERSION.tar.gz" || DIE=1 @@ -347,6 +352,11 @@ for configure_ac in $configure_files; do if grep "^AM_GLIB_GNU_GETTEXT" $basename >/dev/null; then printbold "Running $GLIB_GETTEXTIZE... Ignore non-fatal messages." echo "no" | $GLIB_GETTEXTIZE --force --copy || exit 1 + # This is to copy in mkinstalldirs for glib-gettext + if [ -x $AUTOMAKE_DIR/mkinstalldirs ]; then + echo " copying mkinstalldirs... " + cp -f $AUTOMAKE_DIR/mkinstalldirs $dirname + fi elif grep "^AM_GNU_GETTEXT" $basename >/dev/null; then if grep "^AM_GNU_GETTEXT_VERSION" $basename > /dev/null; then printbold "Running autopoint..." |