diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-12 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 9 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | glib-gettextize.in | 19 |
7 files changed, 68 insertions, 0 deletions
@@ -1,5 +1,14 @@ 2004-07-21 Matthias Clasen <mclasen@redhat.com> + Fix #132858, Sven Neumann, patch by James Henstridge: + + * glib-gettextize.in: modify so that mkinstalldirs will + get installed into auxdir. + + * Makefile.am (gettext_SCRIPTS): install mkinstalldirs. + +2004-07-21 Matthias Clasen <mclasen@redhat.com> + Fix #147651, reported by Oliver Guntermann: * glib/gprintfint.h (_g_vasprintf): Don't wrap vasprintf(), diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index bf22bb5fc..ca9c90320 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,14 @@ 2004-07-21 Matthias Clasen <mclasen@redhat.com> + Fix #132858, Sven Neumann, patch by James Henstridge: + + * glib-gettextize.in: modify so that mkinstalldirs will + get installed into auxdir. + + * Makefile.am (gettext_SCRIPTS): install mkinstalldirs. + +2004-07-21 Matthias Clasen <mclasen@redhat.com> + Fix #147651, reported by Oliver Guntermann: * glib/gprintfint.h (_g_vasprintf): Don't wrap vasprintf(), diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index bf22bb5fc..ca9c90320 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,5 +1,14 @@ 2004-07-21 Matthias Clasen <mclasen@redhat.com> + Fix #132858, Sven Neumann, patch by James Henstridge: + + * glib-gettextize.in: modify so that mkinstalldirs will + get installed into auxdir. + + * Makefile.am (gettext_SCRIPTS): install mkinstalldirs. + +2004-07-21 Matthias Clasen <mclasen@redhat.com> + Fix #147651, reported by Oliver Guntermann: * glib/gprintfint.h (_g_vasprintf): Don't wrap vasprintf(), diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index bf22bb5fc..ca9c90320 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,14 @@ 2004-07-21 Matthias Clasen <mclasen@redhat.com> + Fix #132858, Sven Neumann, patch by James Henstridge: + + * glib-gettextize.in: modify so that mkinstalldirs will + get installed into auxdir. + + * Makefile.am (gettext_SCRIPTS): install mkinstalldirs. + +2004-07-21 Matthias Clasen <mclasen@redhat.com> + Fix #147651, reported by Oliver Guntermann: * glib/gprintfint.h (_g_vasprintf): Don't wrap vasprintf(), diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index bf22bb5fc..ca9c90320 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,14 @@ 2004-07-21 Matthias Clasen <mclasen@redhat.com> + Fix #132858, Sven Neumann, patch by James Henstridge: + + * glib-gettextize.in: modify so that mkinstalldirs will + get installed into auxdir. + + * Makefile.am (gettext_SCRIPTS): install mkinstalldirs. + +2004-07-21 Matthias Clasen <mclasen@redhat.com> + Fix #147651, reported by Oliver Guntermann: * glib/gprintfint.h (_g_vasprintf): Don't wrap vasprintf(), diff --git a/Makefile.am b/Makefile.am index 4432735d3..1380f76f0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -69,6 +69,10 @@ pkgconfig_DATA = glib-2.0.pc gobject-2.0.pc gmodule-2.0.pc gthread-2.0.pc $(pkgconfig_DATA): config.status +# install mkinstalldirs for glib-gettextize's benefit +gettextdir = $(datadir)/glib-2.0/gettext +gettext_SCRIPTS = mkinstalldirs + # build documentation when doing distcheck DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc diff --git a/glib-gettextize.in b/glib-gettextize.in index f424f8b71..01ce883f5 100644 --- a/glib-gettextize.in +++ b/glib-gettextize.in @@ -98,6 +98,20 @@ test -f configure.in || test -f configure.ac || { exit 1 } +configure_in=NONE +if test -f configure.in; then + configure_in=configure.in +else + if test -f configure.ac; then + configure_in=configure.ac + fi +fi +# Check in which directory config.rpath, mkinstalldirs etc. belong. +auxdir=`cat "$configure_in" | grep '^AC_CONFIG_AUX_DIR' | sed -n -e 's/AC_CONFIG_AUX_DIR(\([^()]*\))/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/' | sed -e 1q` +if test -n "$auxdir"; then + auxdir="$auxdir/" +fi + if test -f po/Makefile.in.in && test $force -eq 0; then $echo "\ po/Makefile.in.in exists: use option -f if you really want to delete it." @@ -123,6 +137,11 @@ for file in *; do case $file in intl | po) ;; + mkinstalldirs) + rm -f "$srcdir/$auxdir$file" + ($try_ln_s && ln -s $gettext_dir/$file "$srcdir/$auxdir$file" && $echo "Symlinking file $file") 2>/dev/null || + { $echo "Copying file $file"; cp $file "$srcdir/$auxdir$file"; } + ;; *) rm -f "$srcdir/$file" ($try_ln_s && ln -s $gettext_dir/$file "$srcdir/$file" && $echo "Symlinking file $file") 2>/dev/null || |