From 65dea7bb3a3dfc2b4443ab2175f9e813daeafbcc Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 3 Apr 2012 22:20:48 +0000 Subject: automake 1.11.4 reautoconf git-svn-id: svn://tug.org/texlive/trunk@25841 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/ttf2pk2/Makefile.in | 64 ++++++++++++++++++++++++++++++----- Build/source/texk/ttf2pk2/aclocal.m4 | 6 ++-- 2 files changed, 58 insertions(+), 12 deletions(-) (limited to 'Build/source/texk/ttf2pk2') diff --git a/Build/source/texk/ttf2pk2/Makefile.in b/Build/source/texk/ttf2pk2/Makefile.in index 7a3c808101e..c197ddaacd4 100644 --- a/Build/source/texk/ttf2pk2/Makefile.in +++ b/Build/source/texk/ttf2pk2/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -106,6 +123,11 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ $(LDFLAGS) -o $@ SOURCES = $(ttf2pk_SOURCES) $(ttf2tfm_SOURCES) DIST_SOURCES = $(ttf2pk_SOURCES) $(ttf2tfm_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -412,8 +434,11 @@ distclean-hdr: -rm -f c-auto.h stamp-h1 install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -514,9 +539,18 @@ distclean-libtool: -rm -f libtool config.lt install-man1: $(dist_man1_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list='$(dist_man1_MANS)'; test -n "$(man1dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ + @list1='$(dist_man1_MANS)'; \ + list2=''; \ + test -n "$(man1dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.1[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -546,8 +580,11 @@ uninstall-man1: dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) install-dist_cfgdataDATA: $(dist_cfgdata_DATA) @$(NORMAL_INSTALL) - test -z "$(cfgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(cfgdatadir)" @list='$(dist_cfgdata_DATA)'; test -n "$(cfgdatadir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(cfgdatadir)'"; \ + $(MKDIR_P) '$(DESTDIR)$(cfgdatadir)' || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -564,8 +601,11 @@ uninstall-dist_cfgdataDATA: dir='$(DESTDIR)$(cfgdatadir)'; $(am__uninstall_files_from_dir) install-dist_encdataDATA: $(dist_encdata_DATA) @$(NORMAL_INSTALL) - test -z "$(encdatadir)" || $(MKDIR_P) "$(DESTDIR)$(encdatadir)" @list='$(dist_encdata_DATA)'; test -n "$(encdatadir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(encdatadir)'"; \ + $(MKDIR_P) '$(DESTDIR)$(encdatadir)' || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -582,8 +622,11 @@ uninstall-dist_encdataDATA: dir='$(DESTDIR)$(encdatadir)'; $(am__uninstall_files_from_dir) install-dist_mapdataDATA: $(dist_mapdata_DATA) @$(NORMAL_INSTALL) - test -z "$(mapdatadir)" || $(MKDIR_P) "$(DESTDIR)$(mapdatadir)" @list='$(dist_mapdata_DATA)'; test -n "$(mapdatadir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(mapdatadir)'"; \ + $(MKDIR_P) '$(DESTDIR)$(mapdatadir)' || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -600,8 +643,11 @@ uninstall-dist_mapdataDATA: dir='$(DESTDIR)$(mapdatadir)'; $(am__uninstall_files_from_dir) install-dist_sfddataDATA: $(dist_sfddata_DATA) @$(NORMAL_INSTALL) - test -z "$(sfddatadir)" || $(MKDIR_P) "$(DESTDIR)$(sfddatadir)" @list='$(dist_sfddata_DATA)'; test -n "$(sfddatadir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(sfddatadir)'"; \ + $(MKDIR_P) '$(DESTDIR)$(sfddatadir)' || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff --git a/Build/source/texk/ttf2pk2/aclocal.m4 b/Build/source/texk/ttf2pk2/aclocal.m4 index 92365b0d32a..8c1485265ff 100644 --- a/Build/source/texk/ttf2pk2/aclocal.m4 +++ b/Build/source/texk/ttf2pk2/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- +# generated automatically by aclocal 1.11.4 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, @@ -38,7 +38,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.3], [], +m4_if([$1], [1.11.4], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -54,7 +54,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.3])dnl +[AM_AUTOMAKE_VERSION([1.11.4])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) -- cgit v1.2.3