minor build fixes

git-svn-id: svn://tug.org/texlive/trunk@13354 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 52 insertions, 97 deletions

diff --git a/Build/source/texk/dvipdfmx/data/Makefile.in b/Build/source/texk/dvipdfmx/data/Makefile.in
index 15719e2d11c..fdb46757396 100644
--- a/Build/source/texk/dvipdfmx/data/Makefile.in
+++ b/Build/source/texk/dvipdfmx/data/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,9 +16,8 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -56,7 +54,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(SHELL) $(top_srcdir)/../../build-aux/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -64,25 +61,14 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(cmapdatadir)" \
 	"$(DESTDIR)$(configdatadir)" "$(DESTDIR)$(glyphlistdatadir)" \
 	"$(DESTDIR)$(mapdatadir)"
+dist_cmapdataDATA_INSTALL = $(INSTALL_DATA)
+dist_configdataDATA_INSTALL = $(INSTALL_DATA)
+dist_glyphlistdataDATA_INSTALL = $(INSTALL_DATA)
+dist_mapdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_cmapdata_DATA) $(dist_configdata_DATA) \
 	$(dist_glyphlistdata_DATA) $(dist_mapdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -219,7 +205,7 @@ mapdatadir = ${prefix}/texmf/fonts/map/dvipdfm/dvipdfmx
 dist_mapdata_DATA = \
   $(srcdir)/cid-x.map
 
-cmapdatadir = $(datadir)/texmf/fonts/cmap/dvipdfmx
+cmapdatadir = ${prefix}/texmf/fonts/cmap/dvipdfmx
 dist_cmapdata_DATA = \
   $(srcdir)/EUC-UCS2
 
@@ -235,9 +221,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign data/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  data/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  data/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -255,7 +241,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -265,83 +250,71 @@ clean-libtool:
 install-dist_cmapdataDATA: $(dist_cmapdata_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(cmapdatadir)" || $(MKDIR_P) "$(DESTDIR)$(cmapdatadir)"
-	@list='$(dist_cmapdata_DATA)'; test -n "$(cmapdatadir)" || list=; \
-	for p in $$list; do \
+	@list='$(dist_cmapdata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(cmapdatadir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(cmapdatadir)" || exit $$?; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_cmapdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(cmapdatadir)/$$f'"; \
+	  $(dist_cmapdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(cmapdatadir)/$$f"; \
 	done
 
 uninstall-dist_cmapdataDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_cmapdata_DATA)'; test -n "$(cmapdatadir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(cmapdatadir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(cmapdatadir)" && rm -f $$files
+	@list='$(dist_cmapdata_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(cmapdatadir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(cmapdatadir)/$$f"; \
+	done
 install-dist_configdataDATA: $(dist_configdata_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(configdatadir)" || $(MKDIR_P) "$(DESTDIR)$(configdatadir)"
-	@list='$(dist_configdata_DATA)'; test -n "$(configdatadir)" || list=; \
-	for p in $$list; do \
+	@list='$(dist_configdata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(configdatadir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(configdatadir)" || exit $$?; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_configdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(configdatadir)/$$f'"; \
+	  $(dist_configdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(configdatadir)/$$f"; \
 	done
 
 uninstall-dist_configdataDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_configdata_DATA)'; test -n "$(configdatadir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(configdatadir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(configdatadir)" && rm -f $$files
+	@list='$(dist_configdata_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(configdatadir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(configdatadir)/$$f"; \
+	done
 install-dist_glyphlistdataDATA: $(dist_glyphlistdata_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(glyphlistdatadir)" || $(MKDIR_P) "$(DESTDIR)$(glyphlistdatadir)"
-	@list='$(dist_glyphlistdata_DATA)'; test -n "$(glyphlistdatadir)" || list=; \
-	for p in $$list; do \
+	@list='$(dist_glyphlistdata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(glyphlistdatadir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(glyphlistdatadir)" || exit $$?; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_glyphlistdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(glyphlistdatadir)/$$f'"; \
+	  $(dist_glyphlistdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(glyphlistdatadir)/$$f"; \
 	done
 
 uninstall-dist_glyphlistdataDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_glyphlistdata_DATA)'; test -n "$(glyphlistdatadir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(glyphlistdatadir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(glyphlistdatadir)" && rm -f $$files
+	@list='$(dist_glyphlistdata_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(glyphlistdatadir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(glyphlistdatadir)/$$f"; \
+	done
 install-dist_mapdataDATA: $(dist_mapdata_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(mapdatadir)" || $(MKDIR_P) "$(DESTDIR)$(mapdatadir)"
-	@list='$(dist_mapdata_DATA)'; test -n "$(mapdatadir)" || list=; \
-	for p in $$list; do \
+	@list='$(dist_mapdata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(mapdatadir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(mapdatadir)" || exit $$?; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_mapdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mapdatadir)/$$f'"; \
+	  $(dist_mapdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mapdatadir)/$$f"; \
 	done
 
 uninstall-dist_mapdataDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_mapdata_DATA)'; test -n "$(mapdatadir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(mapdatadir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(mapdatadir)" && rm -f $$files
+	@list='$(dist_mapdata_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(mapdatadir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(mapdatadir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -365,17 +338,13 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
 	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
 	    || exit 1; \
 	  fi; \
 	done
@@ -406,7 +375,6 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -425,8 +393,6 @@ dvi-am:
 
 html: html-am
 
-html-am:
-
 info: info-am
 
 info-am:
@@ -436,28 +402,18 @@ install-data-am: install-dist_cmapdataDATA install-dist_configdataDATA \
 
 install-dvi: install-dvi-am
 
-install-dvi-am:
-
 install-exec-am:
 
 install-html: install-html-am
 
-install-html-am:
-
 install-info: install-info-am
 
-install-info-am:
-
 install-man:
 
 install-pdf: install-pdf-am
 
-install-pdf-am:
-
 install-ps: install-ps-am
 
-install-ps-am:
-
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -497,7 +453,6 @@ uninstall-am: uninstall-dist_cmapdataDATA \
 	uninstall-dist_cmapdataDATA uninstall-dist_configdataDATA \
 	uninstall-dist_glyphlistdataDATA uninstall-dist_mapdataDATA
 
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: