diff options
| author | Bruno Haible <bruno@clisp.org> | 2000-07-26 19:25:48 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2000-07-26 19:25:48 +0000 |
| commit | 3af1d0cfcc4ee759c89277a962cdfbaeff4915f9 (patch) | |
| tree | 3a107af336627b4625e4cddc5ba9416fa7d4cf7e /intl | |
| parent | e8fce08ecfaa2b1a116e8be56ae58098d90c280b (diff) | |
| download | external_gettext-3af1d0cfcc4ee759c89277a962cdfbaeff4915f9.zip external_gettext-3af1d0cfcc4ee759c89277a962cdfbaeff4915f9.tar.gz external_gettext-3af1d0cfcc4ee759c89277a962cdfbaeff4915f9.tar.bz2 | |
Use $(SHELL) for all MKINSTALLDIRS calls.
Diffstat (limited to 'intl')
| -rw-r--r-- | intl/ChangeLog | 3 | ||||
| -rw-r--r-- | intl/Makefile.in | 21 |
2 files changed, 7 insertions, 17 deletions
diff --git a/intl/ChangeLog b/intl/ChangeLog index 527233e..3af3c14 100644 --- 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 e88fd19..623cce3 100644 --- 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 \ |