Changeset 4679 for trunk/osd

Timestamp:

10/11/06 05:24:32 (2 years ago)

Author:

erijo

Message:

My commit in r4677 (and r4678) broke po installation if configured was generated with autoconf 2.60. So instead of going backwards, we'll use Makefile.in.in revision 1.25 from gettext cvs. But with one difference:

localedir = $(datadir)/locale

instead of

localedir = @localedir@

This should work with both autoconf 2.59 and 2.60. I've tested it on both Debian Sarge (autoconf 2.59) and Debian Sid (2.60) and it works for me (tm).But if someone else could try it as well, that would be great! Do make install DESTDIR=/tmp/licq-test if you just want to test the installation without messing with your current installation.

Files:

• trunk/osd/po/Makefile.in.in (modified) (9 diffs)

trunk/osd/po/Makefile.in.in

@@ -1 +1 @@
 # Makefile for PO directory in any package using GNU gettext.
-# Copyright (C) 1995-1997, 2000-2005 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# Copyright (C) 1995-1997, 2000-2006 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
 #
 # This file can be copied and used freely without restrictions.  It can
@@ -9 +9 @@
 # General Public License and is *not* in the public domain.
 #
-# Origin: gettext-0.15
+# Origin: gettext-0.15.1
 
 PACKAGE = @PACKAGE@
@@ -31 +31 @@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
+
+# We use $(mkdir_p).
+# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
+# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
+# @install_sh@ does not start with $(SHELL), so we add it.
+# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
+# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
+# versions, $(mkinstalldirs) and $(install_sh) are unused.
+mkinstalldirs = $(SHELL) @install_sh@ -d
+install_sh = $(SHELL) @install_sh@
+MKDIR_P = @MKDIR_P@
+mkdir_p = @mkdir_p@
 
 GMSGFMT_ = @GMSGFMT@
@@ -169 +179 @@
 install-data: install-data-@USE_NLS@
     if test "$(PACKAGE)" = "gettext-tools"; then \
-      $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+      $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
       for file in $(DISTFILES.common) Makevars.template; do \
         $(INSTALL_DATA) $(srcdir)/$$file \
@@ -182 +192 @@
 install-data-no: all
 install-data-yes: all
-    $(mkinstalldirs) $(DESTDIR)$(datadir)
+    $(mkdir_p) $(DESTDIR)$(datadir)
     @catalogs='$(CATALOGS)'; \
     for cat in $$catalogs; do \
@@ -188 +198 @@
       lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
       dir=$(localedir)/$$lang/LC_MESSAGES; \
-      $(mkinstalldirs) $(DESTDIR)$$dir; \
+      $(mkdir_p) $(DESTDIR)$$dir; \
       if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
       $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
@@ -228 +238 @@
 installdirs-data: installdirs-data-@USE_NLS@
     if test "$(PACKAGE)" = "gettext-tools"; then \
-      $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+      $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
     else \
       : ; \
@@ -234 +244 @@
 installdirs-data-no:
 installdirs-data-yes:
-    $(mkinstalldirs) $(DESTDIR)$(datadir)
+    $(mkdir_p) $(DESTDIR)$(datadir)
     @catalogs='$(CATALOGS)'; \
     for cat in $$catalogs; do \
@@ -240 +250 @@
       lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
       dir=$(localedir)/$$lang/LC_MESSAGES; \
-      $(mkinstalldirs) $(DESTDIR)$$dir; \
+      $(mkdir_p) $(DESTDIR)$$dir; \
       for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
         if test -n "$$lc"; then \