diff options
| author | dobey <> | 2005-11-24 19:05:10 +0000 |
|---|---|---|
| committer | dobey <> | 2005-11-24 19:05:10 +0000 |
| commit | d9d4cba551fa18758887eebcc40853258bdf22bb (patch) | |
| tree | 4d106f3b2a66b8a117f5397f8084efba2df06558 /Makefile.in.in | |
| parent | 212adca57e20743a40fa856e9d069f17a8a9eac9 (diff) | |
| download | intltool-d9d4cba551fa18758887eebcc40853258bdf22bb.tar.gz | |
2005-11-24 Stepan Kasal <kasal@ucw.cz>
* Makefile.in.in (MKINSTALLDIRS): This variable is no longer
defined, remove all references.
($(top_srcdir)/mkinstalldirs): Do not use this script, it's
deprecated and may not be available with Automake >= 1.8.
(mkdir_p): Use this instead. mkdir_p is AC_SUBSTed by Automake >= 1.8.
Until we can suppose that, use "$(install_sh) -d"; it is a safe
fallback working with all versions of Automake >= 1.5.
Diffstat (limited to 'Makefile.in.in')
| -rw-r--r-- | Makefile.in.in | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/Makefile.in.in b/Makefile.in.in index b7dfd61..19ecfe2 100644 --- a/Makefile.in.in +++ b/Makefile.in.in @@ -39,7 +39,9 @@ gnulocaledir = $(datadir)/locale gettextsrcdir = $(datadir)/glib-2.0/gettext/po subdir = po install_sh = @install_sh@ -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +# Automake >= 1.8 provides @mkdir_p@. +# Until it can be supposed, use the safe fallback: +mkdir_p = $(install_sh) -d INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -108,11 +110,7 @@ install-exec: install-data: install-data-@USE_NLS@ install-data-no: all install-data-yes: all - if test -n "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \ - else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \ - fi + $(mkdir_p) $(DESTDIR)$(datadir) @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ @@ -122,11 +120,7 @@ install-data-yes: all esac; \ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \ - if test -n "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $$dir; \ - else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \ - fi; \ + $(mkdir_p) $$dir; \ if test -r $$cat; then \ $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE).mo; \ echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE).mo"; \ @@ -150,11 +144,7 @@ install-data-yes: all fi; \ done if test "$(PACKAGE)" = "glib"; then \ - if test -n "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \ - else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \ - fi; \ + $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ else \ |