Commit 6179b062 authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen

Fix #132858, Sven Neumann, patch by James Henstridge:

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.
parent 2e41f072
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:
......
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:
......
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:
......
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:
......
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:
......
......@@ -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
......
......@@ -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 ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment