summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Caujolle-Bert <f1rmb@users.sourceforge.net>2004-05-08 20:19:45 +0000
committerDaniel Caujolle-Bert <f1rmb@users.sourceforge.net>2004-05-08 20:19:45 +0000
commitb08312ff6399246be8036513f637081c4760c26b (patch)
treed35533f745092cc4e6e8816e2b97f5ba24ba8854
parent80d2afefc9d582c6768d4d78a89064be570bcd13 (diff)
downloadxine-lib-b08312ff6399246be8036513f637081c4760c26b.tar.gz
xine-lib-b08312ff6399246be8036513f637081c4760c26b.tar.bz2
fix .po install with new automake
CVS patchset: 6501 CVS date: 2004/05/08 20:19:45
-rw-r--r--configure.ac6
-rw-r--r--po/Makefile.in.in3
2 files changed, 8 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index fdd23aa92..2c6d26433 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1908,6 +1908,12 @@ AC_CHECK_PROG(SGMLTOOLS, sgmltools, sgmltools, no)
AC_CHECK_PROG(FIG2DEV, fig2dev, fig2dev, no)
+dnl --------------------------
+dnl Newest automake workaround
+dnl --------------------------
+AC_SUBST(mkdir_p)
+
+
dnl ---------------------------------------------
dnl Output configuration files
dnl ---------------------------------------------
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 2c31b7d06..4343922a0 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -26,11 +26,12 @@ exec_prefix = @exec_prefix@
datadir = @datadir@
localedir = $(datadir)/locale
gettextsrcdir = $(datadir)/gettext/po
+mkdir_p = @mkdir_p@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
+mkinstalldirs = `if test ! -z "$(mkdir_p)"; then echo "$(mkdir_p)"; else case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac; fi`
CC = @CC@
GMSGFMT = @GMSGFMT@