diff options
| author | Bruno Haible <bruno@clisp.org> | 2000-07-28 16:42:49 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2000-07-28 16:42:49 +0000 |
| commit | c9a34144fe3ccefca6df9afee6d55b64bab81bff (patch) | |
| tree | fd053e18a5a9ad0e8fe6dcaaf01397f5655180e1 /intl | |
| parent | f9c4869ba39df38cb8bad7dc6174a470d17d1ae7 (diff) | |
| download | external_gettext-c9a34144fe3ccefca6df9afee6d55b64bab81bff.zip external_gettext-c9a34144fe3ccefca6df9afee6d55b64bab81bff.tar.gz external_gettext-c9a34144fe3ccefca6df9afee6d55b64bab81bff.tar.bz2 | |
Fix the MKINSTALLDIRS problem (which autoconf does not adjust automatically).
Diffstat (limited to 'intl')
| -rw-r--r-- | intl/ChangeLog | 7 | ||||
| -rw-r--r-- | intl/Makefile.in | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/intl/ChangeLog b/intl/ChangeLog index 3af3c14..149039b 100644 --- a/intl/ChangeLog +++ b/intl/ChangeLog @@ -1,3 +1,10 @@ +2000-07-28 Bruno Haible <haible@clisp.cons.org> + + * Makefile.in (mkinstalldirs): New macro. Needed when configured with + --srcdir=<relative pathname>; then ac_aux_dir will be a relative + pathname rooted at the top builddir, and @MKINSTALLDIRS@ likewise. + (install-exec, install-data): Use it. + 2000-07-26 Bruno Haible <haible@clisp.cons.org> * Makefile.in (install-exec, install-data): Use $(SHELL) for calling diff --git a/intl/Makefile.in b/intl/Makefile.in index 623cce3..5550b7d 100644 --- a/intl/Makefile.in +++ b/intl/Makefile.in @@ -40,6 +40,7 @@ subdir = intl INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ MKINSTALLDIRS = @MKINSTALLDIRS@ +mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac` l = @l@ @@ -134,15 +135,14 @@ install: install-exec install-data install-exec: all if test "$(PACKAGE)" = "gettext" \ && test '@INTLOBJS@' = '$(GETTOBJS)'; then \ - $(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$(libdir); \ - $(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$(includedir); \ + $(mkinstalldirs) $(DESTDIR)$(libdir) $(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 \ - $(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$(libdir); \ + $(mkinstalldirs) $(DESTDIR)$(libdir); \ test -f $(DESTDIR)$(libdir)/charset.alias \ && orig=$(DESTDIR)$(libdir)/charset.alias \ || orig=charset.alias; \ @@ -156,7 +156,7 @@ install-exec: all fi install-data: all if test "$(PACKAGE)" = "gettext"; then \ - $(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \ + $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \ dists="$(DISTFILES.common)"; \ for file in $$dists; do \ |