You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
96 lines
3.3 KiB
96 lines
3.3 KiB
12 years ago
|
http://bugs.gentoo.org/423767
|
||
|
|
||
|
--- configure.in
|
||
|
+++ configure.in
|
||
|
@@ -69,7 +69,7 @@
|
||
|
dnl Note that there's a copy of these options in the top-level Makefile.am,
|
||
|
dnl so update there too if changing anything.
|
||
|
dnl
|
||
|
-AM_INIT_AUTOMAKE([1.11 gnu no-dependencies parallel-tests dist-bzip2 no-dist-gzip dist-lzma])
|
||
|
+AM_INIT_AUTOMAKE([1.11 gnu no-dependencies parallel-tests dist-bzip2 no-dist-gzip dist-xz])
|
||
|
AM_CONFIG_HEADER(config.h:config.in)
|
||
|
AM_MAINTAINER_MODE
|
||
|
|
||
|
@@ -208,8 +208,7 @@
|
||
|
[enable_fat=no])
|
||
|
|
||
|
# Work around an autoconf bug
|
||
|
-MKDIR_P=@mkdir_p@
|
||
|
-AC_SUBST(MKDIR_P)
|
||
|
+AC_PROG_MKDIR_P
|
||
|
|
||
|
# Table of compilers, options, and mpn paths. This code has various related
|
||
|
# purposes
|
||
|
--- yasm/po/Makefile.in.in
|
||
|
+++ yasm/po/Makefile.in.in
|
||
|
@@ -32,17 +32,17 @@
|
||
|
INSTALL = @INSTALL@
|
||
|
INSTALL_DATA = @INSTALL_DATA@
|
||
|
|
||
|
-# We use $(mkdir_p).
|
||
|
-# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
|
||
|
+# 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
|
||
|
+# 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@
|
||
|
+MKDIR_P = @MKDIR_P@
|
||
|
|
||
|
GMSGFMT_ = @GMSGFMT@
|
||
|
GMSGFMT_no = @GMSGFMT@
|
||
|
@@ -204,7 +204,7 @@
|
||
|
install-exec:
|
||
|
install-data: install-data-@USE_NLS@
|
||
|
if test "$(PACKAGE)" = "gettext-tools"; then \
|
||
|
- $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
|
||
|
+ $(MKDIR_P) $(DESTDIR)$(gettextsrcdir); \
|
||
|
for file in $(DISTFILES.common) Makevars.template; do \
|
||
|
$(INSTALL_DATA) $(srcdir)/$$file \
|
||
|
$(DESTDIR)$(gettextsrcdir)/$$file; \
|
||
|
@@ -217,13 +217,13 @@
|
||
|
fi
|
||
|
install-data-no: all
|
||
|
install-data-yes: all
|
||
|
- $(mkdir_p) $(DESTDIR)$(datadir)
|
||
|
+ $(MKDIR_P) $(DESTDIR)$(datadir)
|
||
|
@catalogs='$(CATALOGS)'; \
|
||
|
for cat in $$catalogs; do \
|
||
|
cat=`basename $$cat`; \
|
||
|
lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
|
||
|
dir=$(localedir)/$$lang/LC_MESSAGES; \
|
||
|
- $(mkdir_p) $(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; \
|
||
|
echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
|
||
|
@@ -263,19 +263,19 @@
|
||
|
installdirs-exec:
|
||
|
installdirs-data: installdirs-data-@USE_NLS@
|
||
|
if test "$(PACKAGE)" = "gettext-tools"; then \
|
||
|
- $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
|
||
|
+ $(MKDIR_P) $(DESTDIR)$(gettextsrcdir); \
|
||
|
else \
|
||
|
: ; \
|
||
|
fi
|
||
|
installdirs-data-no:
|
||
|
installdirs-data-yes:
|
||
|
- $(mkdir_p) $(DESTDIR)$(datadir)
|
||
|
+ $(MKDIR_P) $(DESTDIR)$(datadir)
|
||
|
@catalogs='$(CATALOGS)'; \
|
||
|
for cat in $$catalogs; do \
|
||
|
cat=`basename $$cat`; \
|
||
|
lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
|
||
|
dir=$(localedir)/$$lang/LC_MESSAGES; \
|
||
|
- $(mkdir_p) $(DESTDIR)$$dir; \
|
||
|
+ $(MKDIR_P) $(DESTDIR)$$dir; \
|
||
|
for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
|
||
|
if test -n "$$lc"; then \
|
||
|
if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
|