75 lines
2.4 KiB
Diff
75 lines
2.4 KiB
Diff
Index: m4macros/glib-gettext.m4
|
|
===================================================================
|
|
--- m4macros/glib-gettext.m4.orig
|
|
+++ m4macros/glib-gettext.m4
|
|
@@ -354,18 +354,6 @@ glib_DEFUN([GLIB_GNU_GETTEXT],
|
|
fi
|
|
fi
|
|
|
|
- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
|
|
- dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
|
|
- dnl Try to locate is.
|
|
- MKINSTALLDIRS=
|
|
- if test -n "$ac_aux_dir"; then
|
|
- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
|
|
- fi
|
|
- if test -z "$MKINSTALLDIRS"; then
|
|
- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
|
|
- fi
|
|
- AC_SUBST(MKINSTALLDIRS)
|
|
-
|
|
dnl Generate list of files to be processed by xgettext which will
|
|
dnl be included in po/Makefile.
|
|
test -d po || mkdir po
|
|
Index: po/Makefile.in.in
|
|
===================================================================
|
|
--- po/Makefile.in.in.orig
|
|
+++ po/Makefile.in.in
|
|
@@ -35,7 +35,6 @@ subdir = po
|
|
|
|
INSTALL = @INSTALL@
|
|
INSTALL_DATA = @INSTALL_DATA@
|
|
-MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
|
|
|
|
CC = @CC@
|
|
GENCAT = @GENCAT@
|
|
@@ -120,11 +119,7 @@ install-exec:
|
|
install-data: install-data-@USE_NLS@
|
|
install-data-no: all
|
|
install-data-yes: all
|
|
- if test -r "$(MKINSTALLDIRS)"; then \
|
|
- $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
|
|
- else \
|
|
- $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
|
|
- fi
|
|
+ @mkdir_p@ $(DESTDIR)$(datadir)
|
|
@catalogs='$(CATALOGS)'; \
|
|
for cat in $$catalogs; do \
|
|
cat=`basename $$cat`; \
|
|
@@ -134,11 +129,7 @@ install-data-yes: all
|
|
esac; \
|
|
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
|
|
dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
|
|
- if test -r "$(MKINSTALLDIRS)"; then \
|
|
- $(MKINSTALLDIRS) $$dir; \
|
|
- else \
|
|
- $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
|
|
- fi; \
|
|
+ @mkdir_p@ $$dir; \
|
|
if test -r $$cat; then \
|
|
$(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
|
|
echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
|
|
@@ -162,11 +153,7 @@ install-data-yes: all
|
|
fi; \
|
|
done
|
|
if test "$(PACKAGE)" = "glib"; then \
|
|
- if test -r "$(MKINSTALLDIRS)"; then \
|
|
- $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
|
|
- else \
|
|
- $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
|
|
- fi; \
|
|
+ @mkdir_p@ $(DESTDIR)$(gettextsrcdir); \
|
|
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \
|
|
$(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
|
|
else \
|