summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am3
-rw-r--r--configure.ac4
2 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 01b41a7b5..9b0003437 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,7 @@ DEBFILES = debian/README.Debian debian/changelog debian/control \
debian/copyright debian/rules debian/compat \
debian/shlibdeps.sh debian/libxine-dev.install debian/libxine1.install
-EXTRA_DIST = autogen.sh \
+EXTRA_DIST = @MKINSTALLDIRS@ autogen.sh \
automake.diff \
$(DEBFILES) \
ChangeLog \
@@ -25,7 +25,6 @@ EXTRA_DIST = autogen.sh \
libtool \
ltmain.sh \
missing \
- mkinstalldirs \
NEWS \
README \
TODO \
diff --git a/configure.ac b/configure.ac
index 60daddc52..25b2b8d85 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1915,6 +1915,10 @@ dnl --------------------------
dnl Newest automake workaround
dnl --------------------------
AC_SUBST(mkdir_p)
+if test x"$mkdir_p" = "x"; then
+ MKINSTALLDIRS="mkinstalldirs"
+fi
+AC_SUBST(MKINSTALLDIRS)
dnl ---------------------------------------------