Use $(SHELL) for all MKINSTALLDIRS calls.

diff --git a/intl/ChangeLog b/intl/ChangeLog
index 527233e72dc0dd559001b0dafe5458062cf7eae2..3af3c1473a0362aab95a0597852cc5dc93d53554 100644 (file)
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,5 +1,8 @@
 2000-07-26  Bruno Haible  <haible@clisp.cons.org>
 
+       * Makefile.in (install-exec, install-data): Use $(SHELL) for calling
+       $(MKINSTALLDIRS), don't rely on its execution permissions.
+
        * Makefile.in (LTV_CURRENT, LTV_REVISION, LTV_AGE): New variables.
        (libintl.la): Use them.
 

diff --git a/intl/Makefile.in b/intl/Makefile.in
index e88fd1924ec8a0e5dfe6ffed6950d76c385906a0..623cce3a90d2d8bfbc51265834fae9c255382364 100644 (file)
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -134,24 +134,15 @@ install: install-exec install-data
 install-exec: all
        if test "$(PACKAGE)" = "gettext" \
           && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
-         if test -r $(MKINSTALLDIRS); then \
-           $(MKINSTALLDIRS) $(DESTDIR)$(libdir); \
-           $(MKINSTALLDIRS) $(DESTDIR)$(includedir); \
-         else \
-           $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir); \
-           $(top_srcdir)/mkinstalldirs $(DESTDIR)$(includedir); \
-         fi; \
+         $(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$(libdir); \
+         $(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$(includedir); \
          $(INSTALL_DATA) intlh.inst $(DESTDIR)$(includedir)/libintl.h; \
          $(INSTALL_DATA) libintl.a $(DESTDIR)$(libdir)/libintl.a; \
        else \
          : ; \
        fi; \
        if test '@USE_INCLUDED_LIBINTL@' = yes; then \
-         if test -r $(MKINSTALLDIRS); then \
-           $(MKINSTALLDIRS) $(DESTDIR)$(libdir); \
-         else \
-           $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir); \
-         fi; \
+         $(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$(libdir); \
          test -f $(DESTDIR)$(libdir)/charset.alias \
            && orig=$(DESTDIR)$(libdir)/charset.alias \
            || orig=charset.alias; \
@@ -165,11 +156,7 @@ install-exec: all
        fi
 install-data: all
        if test "$(PACKAGE)" = "gettext"; then \
-         if test -r $(MKINSTALLDIRS); then \
-           $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
-         else \
-           $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
-         fi; \
+         $(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
          $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
          dists="$(DISTFILES.common)"; \
          for file in $$dists; do \

diff --git a/po/ChangeLog b/po/ChangeLog
index 6a4c6bd9464399df0b8aab1fa9157fa96b24d19c..b45ccbe4d50d4fd725574e44e61a16bbca5e86f3 100644 (file)
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,5 +1,10 @@
 2000-07-26  Bruno Haible  <haible@clisp.cons.org>
 
+       * Makefile.in.in (MKINSTALLDIRS): Remove the  $(top_srcdir)/ prefix.
+       configure must get this right.
+       (install-data-yes): Use $(SHELL) for calling $(MKINSTALLDIRS), don't
+       rely on its execution permissions.
+
        * Makefile.in.in (install, uninstall): Provide DESTDIR support, as
        recommended by GNU standards.
        (uninstall): Remove obsolete po-Makefile.in.in line.

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 33e1db245087edaec2189ad1d04caf69c3818006..f5eb38fa0961c4fe6566cbcad5139e59770a3d59 100644 (file)
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -26,7 +26,7 @@ subdir = po
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
+MKINSTALLDIRS = @MKINSTALLDIRS@
 
 CC = @CC@
 GENCAT = @GENCAT@
@@ -110,11 +110,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
+       $(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
        @catalogs='$(CATALOGS)'; \
        for cat in $$catalogs; do \
          cat=`basename $$cat`; \
@@ -124,11 +120,7 @@ install-data-yes: all
          esac; \
          lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
          dir=$$destdir/$$lang/LC_MESSAGES; \
-         if test -r "$(MKINSTALLDIRS)"; then \
-           $(MKINSTALLDIRS) $(DESTDIR)$$dir; \
-         else \
-           $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$$dir; \
-         fi; \
+         $(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$$dir; \
          if test -r $$cat; then \
            $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT); \
            echo "installing $$cat as" \
@@ -154,11 +146,7 @@ install-data-yes: all
          fi; \
        done
        if test "$(PACKAGE)" = "gettext"; then \
-         if test -r "$(MKINSTALLDIRS)"; then \
-           $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
-         else \
-           $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
-         fi; \
+         $(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
          $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
                          $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
        else \