diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | m4/gettext.m4 | 12 | ||||
| -rw-r--r-- | misc/Makefile.common | 2 |
4 files changed, 6 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am index 952d76284..03ae83068 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 = @MKINSTALLDIRS@ autogen.sh \ +EXTRA_DIST = autogen.sh \ automake.diff \ $(DEBFILES) \ ChangeLog \ diff --git a/configure.ac b/configure.ac index 52d4c8502..66c580bdb 100644 --- a/configure.ac +++ b/configure.ac @@ -2139,8 +2139,10 @@ dnl Newest automake workaround dnl --------------------------------------------- AC_SUBST(mkdir_p) -if test x"$mkdir_p" = "x"; then - MKINSTALLDIRS="mkinstalldirs" +if test -n "$ac_aux_dir"; then + MKINSTALLDIRS="$ac_aux_dir/install-sh -d" +else + MKINSTALLDIRS="\$(top_srcdir)/install-sh -d" fi AC_SUBST(MKINSTALLDIRS) diff --git a/m4/gettext.m4 b/m4/gettext.m4 index c9f13b8d1..a27be9a65 100644 --- a/m4/gettext.m4 +++ b/m4/gettext.m4 @@ -350,18 +350,6 @@ strdup strtoul tsearch __argz_count __argz_stringify __argz_next]) 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 Enable libtool support if the surrounding package wishes it. INTL_LIBTOOL_SUFFIX_PREFIX=ifelse([$1], use-libtool, [l], []) AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) diff --git a/misc/Makefile.common b/misc/Makefile.common index 5e26106a0..703ea412a 100644 --- a/misc/Makefile.common +++ b/misc/Makefile.common @@ -29,7 +29,7 @@ install-debug: debug install-includeHEADERS: $(include_HEADERS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(includedir)/xine + $(install_sh) -d $(DESTDIR)$(includedir)/xine @list='$(include_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p"; \ |