From: Paul Eggert Date: Mon, 3 May 2004 06:22:29 +0000 (+0000) Subject: Regenerate. X-Git-Tag: AUTOCONF-2.59c~702 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=555f6e9cfe2cda85b465a6083efd2925df413bd2;p=thirdparty%2Fautoconf.git Regenerate. --- diff --git a/Makefile.in b/Makefile.in index a56a4585a..bc03c19d1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.8.2 from Makefile.am. +# Makefile.in generated by automake 1.8.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -55,7 +55,7 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-recursive installcheck-recursive installdirs-recursive \ pdf-recursive ps-recursive uninstall-info-recursive \ uninstall-recursive -am__installdirs = $(DESTDIR)$(pkgdatadir) +am__installdirs = "$(DESTDIR)$(pkgdatadir)" pkgdataDATA_INSTALL = $(INSTALL_DATA) DATA = $(pkgdata_DATA) ETAGS = etags @@ -197,20 +197,20 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) uninstall-info-am: install-pkgdataDATA: $(pkgdata_DATA) @$(NORMAL_INSTALL) - $(mkdir_p) $(DESTDIR)$(pkgdatadir) + test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)" @list='$(pkgdata_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \ - $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \ + echo " $(pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \ + $(pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \ done uninstall-pkgdataDATA: @$(NORMAL_UNINSTALL) @list='$(pkgdata_DATA)'; for p in $$list; do \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \ - rm -f $(DESTDIR)$(pkgdatadir)/$$f; \ + echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \ + rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \ done # This directory's subdirectories are mostly independent; you can cd @@ -286,10 +286,12 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - if (etags --etags-include --version) >/dev/null 2>&1; then \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ + empty_fix=.; \ else \ include_option=--include; \ + empty_fix=; \ fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ @@ -303,9 +305,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -z "$$unique" && unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -420,7 +424,7 @@ distcheck: dist *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac @@ -443,7 +447,7 @@ distcheck: dist distuninstallcheck \ && chmod -R a-w "$$dc_install_base" \ && ({ \ - (cd ../.. && $(mkdir_p) "$$dc_destdir") \ + (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ @@ -480,7 +484,9 @@ check: check-recursive all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: - $(mkdir_p) $(DESTDIR)$(pkgdatadir) + for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive diff --git a/aclocal.m4 b/aclocal.m4 index c62807e70..c51d1d76b 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.8.2 -*- Autoconf -*- +# generated automatically by aclocal 1.8.4 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 # Free Software Foundation, Inc. @@ -40,7 +40,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"]) # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.8.2])]) + [AM_AUTOMAKE_VERSION([1.8.4])]) # AM_AUX_DIR_EXPAND @@ -428,8 +428,16 @@ fi # # Do not use -m 0755 and let people choose whatever they expect by # setting umask. +# +# We cannot accept any implementation of `mkdir' that recognizes `-p'. +# Some implementations (such as Solaris 8's) are not thread-safe: if a +# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' +# concurrently, both version can detect that a/ is missing, but only +# one can create it and the other will error out. Consequently we +# restrict ourselves to GNU make (using the --version option ensures +# this.) AC_DEFUN([AM_PROG_MKDIR_P], -[if mkdir -p -- . 2>/dev/null; then +[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then # Keeping the `.' argument allows $(mkdir_p) to be used without # argument. Indeed, we sometimes output rules like # $(mkdir_p) $(somedir) @@ -442,7 +450,7 @@ else # recognize any option. It will interpret all options as # directories to create, and then abort because `.' already # exists. - for d in ./-p ./--; + for d in ./-p ./--version; do test -d $d && rmdir $d done diff --git a/bin/Makefile.in b/bin/Makefile.in index ec0fc192f..e2a63f552 100644 --- a/bin/Makefile.in +++ b/bin/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.8.2 from Makefile.am. +# Makefile.in generated by automake 1.8.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -44,7 +44,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs CONFIG_CLEAN_FILES = -am__installdirs = $(DESTDIR)$(bindir) +am__installdirs = "$(DESTDIR)$(bindir)" binSCRIPT_INSTALL = $(INSTALL_SCRIPT) SCRIPTS = $(bin_SCRIPTS) SOURCES = @@ -66,6 +66,7 @@ ECHO_T = @ECHO_T@ EMACS = @EMACS@ EMACSLOADPATH = @EMACSLOADPATH@ EXPR = @EXPR@ +GREP = @GREP@ HELP2MAN = @HELP2MAN@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -251,13 +252,13 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) - $(mkdir_p) $(DESTDIR)$(bindir) + test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" @list='$(bin_SCRIPTS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f $$d$$p; then \ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \ - $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \ + echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ else :; fi; \ done @@ -265,8 +266,8 @@ uninstall-binSCRIPTS: @$(NORMAL_UNINSTALL) @list='$(bin_SCRIPTS)'; for p in $$list; do \ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ - rm -f $(DESTDIR)$(bindir)/$$f; \ + echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ + rm -f "$(DESTDIR)$(bindir)/$$f"; \ done uninstall-info-am: @@ -290,9 +291,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -z "$$unique" && unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -348,7 +351,9 @@ check-am: all-am check: check-am all-am: Makefile $(SCRIPTS) installdirs: - $(mkdir_p) $(DESTDIR)$(bindir) + for dir in "$(DESTDIR)$(bindir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -453,7 +458,7 @@ $(build_libdir)/m4sugar/version.m4: check-forbidden-patterns: if (cd $(srcdir) && \ - grep $(forbidden_patterns) $(forbidden_patterns_files)) \ + $(GREP) $(forbidden_patterns) $(forbidden_patterns_files)) \ >forbidden.log; then \ echo "ERROR: forbidden patterns were found:" >&2; \ sed "s,^,$*.m4: ," &2; \ diff --git a/bin/autoconf.in b/bin/autoconf.in index eedec1115..f3c7be776 100644 --- a/bin/autoconf.in +++ b/bin/autoconf.in @@ -184,7 +184,7 @@ do done - for as_shell in $as_candidate_shells ${SHELL-/bin/sh}; do + for as_shell in $as_candidate_shells $SHELL; do if { $as_shell 2> /dev/null <<\_ASEOF # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then diff --git a/config/Makefile.in b/config/Makefile.in index bacbb363e..e08843d5c 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.8.2 from Makefile.am. +# Makefile.in generated by automake 1.8.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/configure b/configure index 05b8fa627..3ba1a9315 100755 --- a/configure +++ b/configure @@ -185,7 +185,7 @@ test \$exitcode = 0) || { (exit 1); exit 1; } ") 2> /dev/null; then : else - as_candidate_shells="$SHELL" + as_candidate_shells= as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do @@ -200,7 +200,7 @@ do done - for as_shell in $as_candidate_shells; do + for as_shell in $as_candidate_shells $SHELL; do if { $as_shell 2> /dev/null <<\_ASEOF # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -497,7 +497,7 @@ PACKAGE_STRING='GNU Autoconf 2.59a' PACKAGE_BUGREPORT='bug-autoconf@gnu.org' ac_unique_file="ChangeLog" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot ac_cv_sh_n_works EXPR M4 HELP2MAN PERL TEST_EMACS EMACS EMACSLOADPATH lispdir LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot ac_cv_sh_n_works EXPR M4 HELP2MAN PERL TEST_EMACS EMACS EMACSLOADPATH lispdir GREP LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1663,7 +1663,7 @@ else echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi -if mkdir -p -- . 2>/dev/null; then +if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then # Keeping the `.' argument allows $(mkdir_p) to be used without # argument. Indeed, we sometimes output rules like # $(mkdir_p) $(somedir) @@ -1676,7 +1676,7 @@ else # recognize any option. It will interpret all options as # directories to create, and then abort because `.' already # exists. - for d in ./-p ./--; + for d in ./-p ./--version; do test -d $d && rmdir $d done @@ -1887,7 +1887,6 @@ do done done - test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP @@ -1899,7 +1898,19 @@ else echo "${ECHO_T}no" >&6 fi - STRIP=$ac_ct_STRIP + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + if test "$build" != "$host"; then + { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} + fi + STRIP=$ac_ct_STRIP + fi else STRIP="$ac_cv_prog_STRIP" fi @@ -2350,6 +2361,110 @@ fi; +## ------ ## +## Grep. ## +## ------ ## +echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6 +if test "${ac_cv_path_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Extract the first word of "grep ggrep" to use in msg output +if test -z "$GREP"; then +set dummy grep ggrep; ac_prog_name=$2 +if test "${ac_cv_path_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Create a temporary directory, and hook for its removal unless debugging. +$debug || +{ + trap 'exit_status=$?; rm -f -r $tmp && exit $exit_status' 0 + trap '{ (exit 1); exit 1; }' 1 2 13 15 +} + +# Create a (secure) tmp directory for tmp files. +: ${TMPDIR=/tmp} +{ + tmp=`(umask 077 && mktemp -d -q "$TMPDIR/GREPXXXXXX") 2>/dev/null` && + test -n "$tmp" && test -d "$tmp" +} || +{ + tmp=$TMPDIR/GREP$$-$RANDOM + (umask 077 && mkdir $tmp) +} || +{ + echo "$me: cannot create a temporary directory in $TMPDIR" >&2 + { (exit 1); exit 1; } +} +ac_path_GREP_found=false +# Loop through the user's path and test for each of PROGNAME-LIST +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy=" $PATH:/usr/xpg4/bin" +for as_dir in $as_dummy +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + test -f "$ac_path_GREP" || continue + $ac_path_GREP_found || if $as_executable_p "$ac_path_GREP"; then + # Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +if "$ac_path_GREP" --version 2>&1 < /dev/null | grep 'GNU' >/dev/null; then + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=: +else + ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >"$tmp/conftest.in" + while : + do + cat "$tmp/conftest.in" "$tmp/conftest.in" >"$tmp/conftest.tmp" + mv "$tmp/conftest.tmp" "$tmp/conftest.in" + cp "$tmp/conftest.in" "$tmp/conftest.nl" + echo 'GREP' >> "$tmp/conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "$tmp/conftest.nl" >"$tmp/conftest.out" || break + diff "$tmp/conftest.out" "$tmp/conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done +fi + +fi + + $ac_path_GREP_found && break 3 + done +done + +done + +rm -rf "$tmp" + +fi + +GREP="$ac_cv_path_GREP" +if test -z "$GREP"; then + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH:/usr/xpg4/bin" >&5 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH:/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } +fi + +fi + + +fi +echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +echo "${ECHO_T}$ac_cv_path_GREP" >&6 + GREP="$ac_cv_path_GREP" + + + + ## ------------ ## ## Conclusion. ## ## ------------ ## @@ -3029,6 +3144,7 @@ s,@TEST_EMACS@,$TEST_EMACS,;t t s,@EMACS@,$EMACS,;t t s,@EMACSLOADPATH@,$EMACSLOADPATH,;t t s,@lispdir@,$lispdir,;t t +s,@GREP@,$GREP,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF diff --git a/doc/Makefile.in b/doc/Makefile.in index 51f9a4d7c..e2e5b7208 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.8.2 from Makefile.am. +# Makefile.in generated by automake 1.8.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -58,7 +58,7 @@ TEXI2PDF = $(TEXI2DVI) --pdf --batch MAKEINFOHTML = $(MAKEINFO) --html AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS) DVIPS = dvips -am__installdirs = $(DESTDIR)$(infodir) +am__installdirs = "$(DESTDIR)$(infodir)" DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -247,8 +247,8 @@ uninstall-info-am: list='$(INFO_DEPS)'; \ for file in $$list; do \ relfile=`echo "$$file" | sed 's|^.*/||'`; \ - echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$relfile"; \ - install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$relfile; \ + echo " install-info --info-dir='$(DESTDIR)$(infodir)' --remove '$(DESTDIR)$(infodir)/$$relfile'"; \ + install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$$relfile"; \ done; \ else :; fi @$(NORMAL_UNINSTALL) @@ -256,7 +256,7 @@ uninstall-info-am: for file in $$list; do \ relfile=`echo "$$file" | sed 's|^.*/||'`; \ relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \ - (if cd $(DESTDIR)$(infodir); then \ + (if cd "$(DESTDIR)$(infodir)"; then \ echo " rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9])"; \ rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \ else :; fi); \ @@ -339,7 +339,9 @@ check-am: all-am check: check-am all-am: Makefile $(INFO_DEPS) installdirs: - $(mkdir_p) $(DESTDIR)$(infodir) + for dir in "$(DESTDIR)$(infodir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -391,7 +393,7 @@ install-info: install-info-am install-info-am: $(INFO_DEPS) @$(NORMAL_INSTALL) - $(mkdir_p) $(DESTDIR)$(infodir) + test -z "$(infodir)" || $(mkdir_p) "$(DESTDIR)$(infodir)" @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ list='$(INFO_DEPS)'; \ for file in $$list; do \ @@ -404,8 +406,8 @@ install-info-am: $(INFO_DEPS) $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \ if test -f $$ifile; then \ relfile=`echo "$$ifile" | sed 's|^.*/||'`; \ - echo " $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$relfile"; \ - $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$relfile; \ + echo " $(INSTALL_DATA) '$$ifile' '$(DESTDIR)$(infodir)/$$relfile'"; \ + $(INSTALL_DATA) "$$ifile" "$(DESTDIR)$(infodir)/$$relfile"; \ else : ; fi; \ done; \ done @@ -415,8 +417,8 @@ install-info-am: $(INFO_DEPS) list='$(INFO_DEPS)'; \ for file in $$list; do \ relfile=`echo "$$file" | sed 's|^.*/||'`; \ - echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$relfile";\ - install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$relfile || :;\ + echo " install-info --info-dir='$(DESTDIR)$(infodir)' '$(DESTDIR)$(infodir)/$$relfile'";\ + install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\ done; \ else : ; fi install-man: diff --git a/lib/Autom4te/Makefile.in b/lib/Autom4te/Makefile.in index e25ff8793..e9c64826a 100644 --- a/lib/Autom4te/Makefile.in +++ b/lib/Autom4te/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.8.2 from Makefile.am. +# Makefile.in generated by automake 1.8.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -46,7 +46,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = -am__installdirs = $(DESTDIR)$(perllibdir) +am__installdirs = "$(DESTDIR)$(perllibdir)" dist_perllibDATA_INSTALL = $(INSTALL_DATA) DATA = $(dist_perllib_DATA) ETAGS = etags @@ -162,20 +162,20 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) uninstall-info-am: install-dist_perllibDATA: $(dist_perllib_DATA) @$(NORMAL_INSTALL) - $(mkdir_p) $(DESTDIR)$(perllibdir) + test -z "$(perllibdir)" || $(mkdir_p) "$(DESTDIR)$(perllibdir)" @list='$(dist_perllib_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(dist_perllibDATA_INSTALL) $$d$$p $(DESTDIR)$(perllibdir)/$$f"; \ - $(dist_perllibDATA_INSTALL) $$d$$p $(DESTDIR)$(perllibdir)/$$f; \ + echo " $(dist_perllibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(perllibdir)/$$f'"; \ + $(dist_perllibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(perllibdir)/$$f"; \ done uninstall-dist_perllibDATA: @$(NORMAL_UNINSTALL) @list='$(dist_perllib_DATA)'; for p in $$list; do \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(perllibdir)/$$f"; \ - rm -f $(DESTDIR)$(perllibdir)/$$f; \ + echo " rm -f '$(DESTDIR)$(perllibdir)/$$f'"; \ + rm -f "$(DESTDIR)$(perllibdir)/$$f"; \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -198,9 +198,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -z "$$unique" && unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -255,7 +257,9 @@ check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: - $(mkdir_p) $(DESTDIR)$(perllibdir) + for dir in "$(DESTDIR)$(perllibdir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/lib/Makefile.in b/lib/Makefile.in index b493e0660..9053d331a 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.8.2 from Makefile.am. +# Makefile.in generated by automake 1.8.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -51,7 +51,7 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-recursive installcheck-recursive installdirs-recursive \ pdf-recursive ps-recursive uninstall-info-recursive \ uninstall-recursive -am__installdirs = $(DESTDIR)$(pkgdatadir) +am__installdirs = "$(DESTDIR)$(pkgdatadir)" nodist_pkgdataDATA_INSTALL = $(INSTALL_DATA) DATA = $(nodist_pkgdata_DATA) ETAGS = etags @@ -176,20 +176,20 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) uninstall-info-am: install-nodist_pkgdataDATA: $(nodist_pkgdata_DATA) @$(NORMAL_INSTALL) - $(mkdir_p) $(DESTDIR)$(pkgdatadir) + test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)" @list='$(nodist_pkgdata_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(nodist_pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \ - $(nodist_pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \ + echo " $(nodist_pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \ + $(nodist_pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \ done uninstall-nodist_pkgdataDATA: @$(NORMAL_UNINSTALL) @list='$(nodist_pkgdata_DATA)'; for p in $$list; do \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \ - rm -f $(DESTDIR)$(pkgdatadir)/$$f; \ + echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \ + rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \ done # This directory's subdirectories are mostly independent; you can cd @@ -265,10 +265,12 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - if (etags --etags-include --version) >/dev/null 2>&1; then \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ + empty_fix=.; \ else \ include_option=--include; \ + empty_fix=; \ fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ @@ -282,9 +284,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -z "$$unique" && unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -353,7 +357,9 @@ check: check-recursive all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: - $(mkdir_p) $(DESTDIR)$(pkgdatadir) + for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive diff --git a/lib/autoconf/Makefile.in b/lib/autoconf/Makefile.in index 300b6f733..e97a993aa 100644 --- a/lib/autoconf/Makefile.in +++ b/lib/autoconf/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.8.2 from Makefile.am. +# Makefile.in generated by automake 1.8.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -46,7 +46,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = -am__installdirs = $(DESTDIR)$(autoconflibdir) $(DESTDIR)$(autoconflibdir) +am__installdirs = "$(DESTDIR)$(autoconflibdir)" "$(DESTDIR)$(autoconflibdir)" dist_autoconflibDATA_INSTALL = $(INSTALL_DATA) nodist_autoconflibDATA_INSTALL = $(INSTALL_DATA) DATA = $(dist_autoconflib_DATA) $(nodist_autoconflib_DATA) @@ -67,6 +67,7 @@ ECHO_T = @ECHO_T@ EMACS = @EMACS@ EMACSLOADPATH = @EMACSLOADPATH@ EXPR = @EXPR@ +GREP = @GREP@ HELP2MAN = @HELP2MAN@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -226,37 +227,37 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) uninstall-info-am: install-dist_autoconflibDATA: $(dist_autoconflib_DATA) @$(NORMAL_INSTALL) - $(mkdir_p) $(DESTDIR)$(autoconflibdir) + test -z "$(autoconflibdir)" || $(mkdir_p) "$(DESTDIR)$(autoconflibdir)" @list='$(dist_autoconflib_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(dist_autoconflibDATA_INSTALL) $$d$$p $(DESTDIR)$(autoconflibdir)/$$f"; \ - $(dist_autoconflibDATA_INSTALL) $$d$$p $(DESTDIR)$(autoconflibdir)/$$f; \ + echo " $(dist_autoconflibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(autoconflibdir)/$$f'"; \ + $(dist_autoconflibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(autoconflibdir)/$$f"; \ done uninstall-dist_autoconflibDATA: @$(NORMAL_UNINSTALL) @list='$(dist_autoconflib_DATA)'; for p in $$list; do \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(autoconflibdir)/$$f"; \ - rm -f $(DESTDIR)$(autoconflibdir)/$$f; \ + echo " rm -f '$(DESTDIR)$(autoconflibdir)/$$f'"; \ + rm -f "$(DESTDIR)$(autoconflibdir)/$$f"; \ done install-nodist_autoconflibDATA: $(nodist_autoconflib_DATA) @$(NORMAL_INSTALL) - $(mkdir_p) $(DESTDIR)$(autoconflibdir) + test -z "$(autoconflibdir)" || $(mkdir_p) "$(DESTDIR)$(autoconflibdir)" @list='$(nodist_autoconflib_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(nodist_autoconflibDATA_INSTALL) $$d$$p $(DESTDIR)$(autoconflibdir)/$$f"; \ - $(nodist_autoconflibDATA_INSTALL) $$d$$p $(DESTDIR)$(autoconflibdir)/$$f; \ + echo " $(nodist_autoconflibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(autoconflibdir)/$$f'"; \ + $(nodist_autoconflibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(autoconflibdir)/$$f"; \ done uninstall-nodist_autoconflibDATA: @$(NORMAL_UNINSTALL) @list='$(nodist_autoconflib_DATA)'; for p in $$list; do \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(autoconflibdir)/$$f"; \ - rm -f $(DESTDIR)$(autoconflibdir)/$$f; \ + echo " rm -f '$(DESTDIR)$(autoconflibdir)/$$f'"; \ + rm -f "$(DESTDIR)$(autoconflibdir)/$$f"; \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -279,9 +280,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -z "$$unique" && unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -338,7 +341,9 @@ check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: - $(mkdir_p) $(DESTDIR)$(autoconflibdir) $(DESTDIR)$(autoconflibdir) + for dir in "$(DESTDIR)$(autoconflibdir)" "$(DESTDIR)$(autoconflibdir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -452,7 +457,7 @@ $(build_libdir)/m4sugar/version.m4: check-forbidden-patterns: if (cd $(srcdir) && \ - grep $(forbidden_patterns) $(forbidden_patterns_files)) \ + $(GREP) $(forbidden_patterns) $(forbidden_patterns_files)) \ >forbidden.log; then \ echo "ERROR: forbidden patterns were found:" >&2; \ sed "s,^,$*.m4: ," &2; \ diff --git a/lib/autoscan/Makefile.in b/lib/autoscan/Makefile.in index 986c17a9c..3f885e11b 100644 --- a/lib/autoscan/Makefile.in +++ b/lib/autoscan/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.8.2 from Makefile.am. +# Makefile.in generated by automake 1.8.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -46,7 +46,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = -am__installdirs = $(DESTDIR)$(autoscanlibdir) +am__installdirs = "$(DESTDIR)$(autoscanlibdir)" nodist_autoscanlibDATA_INSTALL = $(INSTALL_DATA) DATA = $(nodist_autoscanlib_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -64,6 +64,7 @@ ECHO_T = @ECHO_T@ EMACS = @EMACS@ EMACSLOADPATH = @EMACSLOADPATH@ EXPR = @EXPR@ +GREP = @GREP@ HELP2MAN = @HELP2MAN@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -213,20 +214,20 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) uninstall-info-am: install-nodist_autoscanlibDATA: $(nodist_autoscanlib_DATA) @$(NORMAL_INSTALL) - $(mkdir_p) $(DESTDIR)$(autoscanlibdir) + test -z "$(autoscanlibdir)" || $(mkdir_p) "$(DESTDIR)$(autoscanlibdir)" @list='$(nodist_autoscanlib_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(nodist_autoscanlibDATA_INSTALL) $$d$$p $(DESTDIR)$(autoscanlibdir)/$$f"; \ - $(nodist_autoscanlibDATA_INSTALL) $$d$$p $(DESTDIR)$(autoscanlibdir)/$$f; \ + echo " $(nodist_autoscanlibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(autoscanlibdir)/$$f'"; \ + $(nodist_autoscanlibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(autoscanlibdir)/$$f"; \ done uninstall-nodist_autoscanlibDATA: @$(NORMAL_UNINSTALL) @list='$(nodist_autoscanlib_DATA)'; for p in $$list; do \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(autoscanlibdir)/$$f"; \ - rm -f $(DESTDIR)$(autoscanlibdir)/$$f; \ + echo " rm -f '$(DESTDIR)$(autoscanlibdir)/$$f'"; \ + rm -f "$(DESTDIR)$(autoscanlibdir)/$$f"; \ done tags: TAGS TAGS: @@ -267,7 +268,9 @@ check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: - $(mkdir_p) $(DESTDIR)$(autoscanlibdir) + for dir in "$(DESTDIR)$(autoscanlibdir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -372,7 +375,7 @@ $(build_libdir)/m4sugar/version.m4: check-forbidden-patterns: if (cd $(srcdir) && \ - grep $(forbidden_patterns) $(forbidden_patterns_files)) \ + $(GREP) $(forbidden_patterns) $(forbidden_patterns_files)) \ >forbidden.log; then \ echo "ERROR: forbidden patterns were found:" >&2; \ sed "s,^,$*.m4: ," &2; \ diff --git a/lib/autotest/Makefile.in b/lib/autotest/Makefile.in index 3d4f7fdf0..40c6564a4 100644 --- a/lib/autotest/Makefile.in +++ b/lib/autotest/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.8.2 from Makefile.am. +# Makefile.in generated by automake 1.8.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -46,7 +46,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = -am__installdirs = $(DESTDIR)$(autotestlibdir) $(DESTDIR)$(autotestlibdir) +am__installdirs = "$(DESTDIR)$(autotestlibdir)" "$(DESTDIR)$(autotestlibdir)" dist_autotestlibDATA_INSTALL = $(INSTALL_DATA) nodist_autotestlibDATA_INSTALL = $(INSTALL_DATA) DATA = $(dist_autotestlib_DATA) $(nodist_autotestlib_DATA) @@ -67,6 +67,7 @@ ECHO_T = @ECHO_T@ EMACS = @EMACS@ EMACSLOADPATH = @EMACSLOADPATH@ EXPR = @EXPR@ +GREP = @GREP@ HELP2MAN = @HELP2MAN@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -220,37 +221,37 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) uninstall-info-am: install-dist_autotestlibDATA: $(dist_autotestlib_DATA) @$(NORMAL_INSTALL) - $(mkdir_p) $(DESTDIR)$(autotestlibdir) + test -z "$(autotestlibdir)" || $(mkdir_p) "$(DESTDIR)$(autotestlibdir)" @list='$(dist_autotestlib_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(dist_autotestlibDATA_INSTALL) $$d$$p $(DESTDIR)$(autotestlibdir)/$$f"; \ - $(dist_autotestlibDATA_INSTALL) $$d$$p $(DESTDIR)$(autotestlibdir)/$$f; \ + echo " $(dist_autotestlibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(autotestlibdir)/$$f'"; \ + $(dist_autotestlibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(autotestlibdir)/$$f"; \ done uninstall-dist_autotestlibDATA: @$(NORMAL_UNINSTALL) @list='$(dist_autotestlib_DATA)'; for p in $$list; do \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(autotestlibdir)/$$f"; \ - rm -f $(DESTDIR)$(autotestlibdir)/$$f; \ + echo " rm -f '$(DESTDIR)$(autotestlibdir)/$$f'"; \ + rm -f "$(DESTDIR)$(autotestlibdir)/$$f"; \ done install-nodist_autotestlibDATA: $(nodist_autotestlib_DATA) @$(NORMAL_INSTALL) - $(mkdir_p) $(DESTDIR)$(autotestlibdir) + test -z "$(autotestlibdir)" || $(mkdir_p) "$(DESTDIR)$(autotestlibdir)" @list='$(nodist_autotestlib_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(nodist_autotestlibDATA_INSTALL) $$d$$p $(DESTDIR)$(autotestlibdir)/$$f"; \ - $(nodist_autotestlibDATA_INSTALL) $$d$$p $(DESTDIR)$(autotestlibdir)/$$f; \ + echo " $(nodist_autotestlibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(autotestlibdir)/$$f'"; \ + $(nodist_autotestlibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(autotestlibdir)/$$f"; \ done uninstall-nodist_autotestlibDATA: @$(NORMAL_UNINSTALL) @list='$(nodist_autotestlib_DATA)'; for p in $$list; do \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(autotestlibdir)/$$f"; \ - rm -f $(DESTDIR)$(autotestlibdir)/$$f; \ + echo " rm -f '$(DESTDIR)$(autotestlibdir)/$$f'"; \ + rm -f "$(DESTDIR)$(autotestlibdir)/$$f"; \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -273,9 +274,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -z "$$unique" && unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -332,7 +335,9 @@ check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: - $(mkdir_p) $(DESTDIR)$(autotestlibdir) $(DESTDIR)$(autotestlibdir) + for dir in "$(DESTDIR)$(autotestlibdir)" "$(DESTDIR)$(autotestlibdir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -446,7 +451,7 @@ $(build_libdir)/m4sugar/version.m4: check-forbidden-patterns: if (cd $(srcdir) && \ - grep $(forbidden_patterns) $(forbidden_patterns_files)) \ + $(GREP) $(forbidden_patterns) $(forbidden_patterns_files)) \ >forbidden.log; then \ echo "ERROR: forbidden patterns were found:" >&2; \ sed "s,^,$*.m4: ," &2; \ diff --git a/lib/emacs/Makefile.in b/lib/emacs/Makefile.in index 3c93454bf..0d16cce2c 100644 --- a/lib/emacs/Makefile.in +++ b/lib/emacs/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.8.2 from Makefile.am. +# Makefile.in generated by automake 1.8.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -46,11 +46,12 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = -am__installdirs = $(DESTDIR)$(lispdir) +am__installdirs = "$(DESTDIR)$(lispdir)" dist_lispLISP_INSTALL = $(INSTALL_DATA) LISP = $(dist_lisp_LISP) -ELCFILES = autoconf-mode.elc autotest-mode.elc am__ELFILES = autoconf-mode.el autotest-mode.el +am__ELCFILES = $(am__ELFILES:.el=.elc) +ELCFILES = $(am__ELCFILES) elisp_comp = $(top_srcdir)/config/elisp-comp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -118,7 +119,6 @@ dist_lisp_LISP = autoconf-mode.el autotest-mode.el all: all-am .SUFFIXES: -.SUFFIXES: .el .elc $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -152,6 +152,7 @@ uninstall-info-am: elc-stamp: $(am__ELFILES) @echo 'WARNING: Warnings can be ignored. :-)' + @rm -f elc-temp && touch elc-temp if test "$(EMACS)" != no; then \ set x; \ list='$(am__ELFILES)'; for p in $$list; do \ @@ -161,9 +162,8 @@ elc-stamp: $(am__ELFILES) shift; \ EMACS="$(EMACS)" $(SHELL) $(elisp_comp) "$$@" || exit 1; \ else : ; fi - touch $@ - -.el.elc: + @mv -f elc-temp $@ +$(am__ELCFILES): elc-stamp @if test ! -f $@; then \ rm -f elc-stamp; \ $(MAKE) $(AM_MAKEFLAGS) elc-stamp; \ @@ -171,15 +171,15 @@ elc-stamp: $(am__ELFILES) install-dist_lispLISP: $(dist_lisp_LISP) $(ELCFILES) @$(NORMAL_INSTALL) @if test "$(EMACS)" != no; then \ - $(mkdir_p) $(DESTDIR)$(lispdir); \ + test -z "$(lispdir)" || $(mkdir_p) "$(DESTDIR)$(lispdir)"; \ list='$(dist_lisp_LISP)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(dist_lispLISP_INSTALL) $$d$$p $(DESTDIR)$(lispdir)/$$f"; \ - $(dist_lispLISP_INSTALL) $$d$$p $(DESTDIR)$(lispdir)/$$f; \ + echo " $(dist_lispLISP_INSTALL) '$$d$$p' '$(DESTDIR)$(lispdir)/$$f'"; \ + $(dist_lispLISP_INSTALL) "$$d$$p" "$(DESTDIR)$(lispdir)/$$f"; \ if test -f $${p}c; then \ - echo " $(dist_lispLISP_INSTALL) $${p}c $(DESTDIR)$(lispdir)/$${f}c"; \ - $(dist_lispLISP_INSTALL) $${p}c $(DESTDIR)$(lispdir)/$${f}c; \ + echo " $(dist_lispLISP_INSTALL) '$${p}c' '$(DESTDIR)$(lispdir)/$${f}c'"; \ + $(dist_lispLISP_INSTALL) "$${p}c" "$(DESTDIR)$(lispdir)/$${f}c"; \ else : ; fi; \ done; \ else : ; fi @@ -189,8 +189,8 @@ uninstall-dist_lispLISP: @if test "$(EMACS)" != no; then \ list='$(dist_lisp_LISP)'; for p in $$list; do \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(lispdir)/$$f $(DESTDIR)$(lispdir)/$${f}c"; \ - rm -f $(DESTDIR)$(lispdir)/$$f $(DESTDIR)$(lispdir)/$${f}c; \ + echo " rm -f '$(DESTDIR)$(lispdir)/$$f' '$(DESTDIR)$(lispdir)/$${f}c'"; \ + rm -f "$(DESTDIR)$(lispdir)/$$f" "$(DESTDIR)$(lispdir)/$${f}c"; \ done; \ else : ; fi @@ -232,9 +232,11 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(LISP) elc-stamp $(ELCFILES) +all-am: Makefile $(LISP) $(ELCFILES) installdirs: - $(mkdir_p) $(DESTDIR)$(lispdir) + for dir in "$(DESTDIR)$(lispdir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/lib/m4sugar/Makefile.in b/lib/m4sugar/Makefile.in index 02fd88488..8be6ed6bb 100644 --- a/lib/m4sugar/Makefile.in +++ b/lib/m4sugar/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.8.2 from Makefile.am. +# Makefile.in generated by automake 1.8.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -46,7 +46,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = -am__installdirs = $(DESTDIR)$(m4sugarlibdir) $(DESTDIR)$(m4sugarlibdir) +am__installdirs = "$(DESTDIR)$(m4sugarlibdir)" "$(DESTDIR)$(m4sugarlibdir)" dist_m4sugarlibDATA_INSTALL = $(INSTALL_DATA) nodist_m4sugarlibDATA_INSTALL = $(INSTALL_DATA) DATA = $(dist_m4sugarlib_DATA) $(nodist_m4sugarlib_DATA) @@ -67,6 +67,7 @@ ECHO_T = @ECHO_T@ EMACS = @EMACS@ EMACSLOADPATH = @EMACSLOADPATH@ EXPR = @EXPR@ +GREP = @GREP@ HELP2MAN = @HELP2MAN@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -220,37 +221,37 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) uninstall-info-am: install-dist_m4sugarlibDATA: $(dist_m4sugarlib_DATA) @$(NORMAL_INSTALL) - $(mkdir_p) $(DESTDIR)$(m4sugarlibdir) + test -z "$(m4sugarlibdir)" || $(mkdir_p) "$(DESTDIR)$(m4sugarlibdir)" @list='$(dist_m4sugarlib_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(dist_m4sugarlibDATA_INSTALL) $$d$$p $(DESTDIR)$(m4sugarlibdir)/$$f"; \ - $(dist_m4sugarlibDATA_INSTALL) $$d$$p $(DESTDIR)$(m4sugarlibdir)/$$f; \ + echo " $(dist_m4sugarlibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(m4sugarlibdir)/$$f'"; \ + $(dist_m4sugarlibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(m4sugarlibdir)/$$f"; \ done uninstall-dist_m4sugarlibDATA: @$(NORMAL_UNINSTALL) @list='$(dist_m4sugarlib_DATA)'; for p in $$list; do \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(m4sugarlibdir)/$$f"; \ - rm -f $(DESTDIR)$(m4sugarlibdir)/$$f; \ + echo " rm -f '$(DESTDIR)$(m4sugarlibdir)/$$f'"; \ + rm -f "$(DESTDIR)$(m4sugarlibdir)/$$f"; \ done install-nodist_m4sugarlibDATA: $(nodist_m4sugarlib_DATA) @$(NORMAL_INSTALL) - $(mkdir_p) $(DESTDIR)$(m4sugarlibdir) + test -z "$(m4sugarlibdir)" || $(mkdir_p) "$(DESTDIR)$(m4sugarlibdir)" @list='$(nodist_m4sugarlib_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(nodist_m4sugarlibDATA_INSTALL) $$d$$p $(DESTDIR)$(m4sugarlibdir)/$$f"; \ - $(nodist_m4sugarlibDATA_INSTALL) $$d$$p $(DESTDIR)$(m4sugarlibdir)/$$f; \ + echo " $(nodist_m4sugarlibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(m4sugarlibdir)/$$f'"; \ + $(nodist_m4sugarlibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(m4sugarlibdir)/$$f"; \ done uninstall-nodist_m4sugarlibDATA: @$(NORMAL_UNINSTALL) @list='$(nodist_m4sugarlib_DATA)'; for p in $$list; do \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(m4sugarlibdir)/$$f"; \ - rm -f $(DESTDIR)$(m4sugarlibdir)/$$f; \ + echo " rm -f '$(DESTDIR)$(m4sugarlibdir)/$$f'"; \ + rm -f "$(DESTDIR)$(m4sugarlibdir)/$$f"; \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -273,9 +274,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -z "$$unique" && unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -332,7 +335,9 @@ check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: - $(mkdir_p) $(DESTDIR)$(m4sugarlibdir) $(DESTDIR)$(m4sugarlibdir) + for dir in "$(DESTDIR)$(m4sugarlibdir)" "$(DESTDIR)$(m4sugarlibdir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -461,7 +466,7 @@ $(build_libdir)/m4sugar/version.m4: check-forbidden-patterns: if (cd $(srcdir) && \ - grep $(forbidden_patterns) $(forbidden_patterns_files)) \ + $(GREP) $(forbidden_patterns) $(forbidden_patterns_files)) \ >forbidden.log; then \ echo "ERROR: forbidden patterns were found:" >&2; \ sed "s,^,$*.m4: ," &2; \ diff --git a/man/Makefile.in b/man/Makefile.in index 96676f58f..41bb04bd3 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.8.2 from Makefile.am. +# Makefile.in generated by automake 1.8.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -46,7 +46,7 @@ CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = man1dir = $(mandir)/man1 -am__installdirs = $(DESTDIR)$(man1dir) +am__installdirs = "$(DESTDIR)$(man1dir)" NROFF = nroff MANS = $(dist_man_MANS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -160,7 +160,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - $(mkdir_p) $(DESTDIR)$(man1dir) + test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -179,8 +179,8 @@ install-man1: $(man1_MANS) $(man_MANS) inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ - $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ done uninstall-man1: @$(NORMAL_UNINSTALL) @@ -200,8 +200,8 @@ uninstall-man1: inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \ - rm -f $(DESTDIR)$(man1dir)/$$inst; \ + echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ done tags: TAGS TAGS: @@ -241,7 +241,9 @@ check-am: all-am check: check-am all-am: Makefile $(MANS) installdirs: - $(mkdir_p) $(DESTDIR)$(man1dir) + for dir in "$(DESTDIR)$(man1dir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tests/Makefile.in b/tests/Makefile.in index 412cb8034..4345fd33e 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.8.2 from Makefile.am. +# Makefile.in generated by automake 1.8.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -62,6 +62,7 @@ ECHO_T = @ECHO_T@ EMACS = @EMACS@ EMACSLOADPATH = @EMACSLOADPATH@ EXPR = @EXPR@ +GREP = @GREP@ HELP2MAN = @HELP2MAN@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -423,7 +424,7 @@ $(build_libdir)/m4sugar/version.m4: check-forbidden-patterns: if (cd $(srcdir) && \ - grep $(forbidden_patterns) $(forbidden_patterns_files)) \ + $(GREP) $(forbidden_patterns) $(forbidden_patterns_files)) \ >forbidden.log; then \ echo "ERROR: forbidden patterns were found:" >&2; \ sed "s,^,$*.m4: ," &2; \