| 1 | Description: Patch due to updating to current autotools |
| 2 | . |
| 3 | survex (1.2.6-4+expo4) UNRELEASED; urgency=low |
| 4 | . |
| 5 | * Enabled findentrances utility - uses libproj |
| 6 | Author: Wookey <wookey@debian.org> |
| 7 | |
| 8 | |
| 9 | --- survex-1.2.6.orig/Makefile.in |
| 10 | +++ survex-1.2.6/Makefile.in |
| 11 | @@ -1,4 +1,4 @@ |
| 12 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. |
| 13 | +# Makefile.in generated by automake 1.11.5 from Makefile.am. |
| 14 | # @configure_input@ |
| 15 | |
| 16 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
| 17 | @@ -15,6 +15,23 @@ |
| 18 | |
| 19 | @SET_MAKE@ |
| 20 | VPATH = @srcdir@ |
| 21 | +am__make_dryrun = \ |
| 22 | + { \ |
| 23 | + am__dry=no; \ |
| 24 | + case $$MAKEFLAGS in \ |
| 25 | + *\\[\ \ ]*) \ |
| 26 | + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
| 27 | + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
| 28 | + *) \ |
| 29 | + for am__flg in $$MAKEFLAGS; do \ |
| 30 | + case $$am__flg in \ |
| 31 | + *=*|--*) ;; \ |
| 32 | + *n*) am__dry=yes; break;; \ |
| 33 | + esac; \ |
| 34 | + done;; \ |
| 35 | + esac; \ |
| 36 | + test $$am__dry = yes; \ |
| 37 | + } |
| 38 | pkgdatadir = $(datadir)/@PACKAGE@ |
| 39 | pkgincludedir = $(includedir)/@PACKAGE@ |
| 40 | pkglibdir = $(libdir)/@PACKAGE@ |
| 41 | @@ -60,6 +77,11 @@ RECURSIVE_TARGETS = all-recursive check- |
| 42 | install-pdf-recursive install-ps-recursive install-recursive \ |
| 43 | installcheck-recursive installdirs-recursive pdf-recursive \ |
| 44 | ps-recursive uninstall-recursive |
| 45 | +am__can_run_installinfo = \ |
| 46 | + case $$AM_UPDATE_INFO_DIR in \ |
| 47 | + n|no|NO) false;; \ |
| 48 | + *) (install-info --version) >/dev/null 2>&1;; \ |
| 49 | + esac |
| 50 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
| 51 | distclean-recursive maintainer-clean-recursive |
| 52 | AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ |
| 53 | @@ -484,13 +506,10 @@ distdir: $(DISTFILES) |
| 54 | done |
| 55 | @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
| 56 | if test "$$subdir" = .; then :; else \ |
| 57 | - test -d "$(distdir)/$$subdir" \ |
| 58 | - || $(MKDIR_P) "$(distdir)/$$subdir" \ |
| 59 | - || exit 1; \ |
| 60 | - fi; \ |
| 61 | - done |
| 62 | - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
| 63 | - if test "$$subdir" = .; then :; else \ |
| 64 | + $(am__make_dryrun) \ |
| 65 | + || test -d "$(distdir)/$$subdir" \ |
| 66 | + || $(MKDIR_P) "$(distdir)/$$subdir" \ |
| 67 | + || exit 1; \ |
| 68 | dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ |
| 69 | $(am__relativize); \ |
| 70 | new_distdir=$$reldir; \ |
| 71 | --- survex-1.2.6.orig/aclocal.m4 |
| 72 | +++ survex-1.2.6/aclocal.m4 |
| 73 | @@ -1,4 +1,4 @@ |
| 74 | -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- |
| 75 | +# generated automatically by aclocal 1.11.5 -*- Autoconf -*- |
| 76 | |
| 77 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
| 78 | # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, |
| 79 | @@ -14,8 +14,8 @@ |
| 80 | |
| 81 | m4_ifndef([AC_AUTOCONF_VERSION], |
| 82 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
| 83 | -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, |
| 84 | -[m4_warning([this file was generated for autoconf 2.68. |
| 85 | +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, |
| 86 | +[m4_warning([this file was generated for autoconf 2.69. |
| 87 | You have another version of autoconf. It may work, but is not guaranteed to. |
| 88 | If you have problems, you may need to regenerate the build system entirely. |
| 89 | To do so, use the procedure documented by the package, typically `autoreconf'.])]) |
| 90 | @@ -38,7 +38,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], |
| 91 | [am__api_version='1.11' |
| 92 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
| 93 | dnl require some minimum version. Point them to the right macro. |
| 94 | -m4_if([$1], [1.11.3], [], |
| 95 | +m4_if([$1], [1.11.5], [], |
| 96 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
| 97 | ]) |
| 98 | |
| 99 | @@ -54,7 +54,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) |
| 100 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
| 101 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
| 102 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
| 103 | -[AM_AUTOMAKE_VERSION([1.11.3])dnl |
| 104 | +[AM_AUTOMAKE_VERSION([1.11.5])dnl |
| 105 | m4_ifndef([AC_AUTOCONF_VERSION], |
| 106 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
| 107 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
| 108 | --- survex-1.2.6.orig/configure |
| 109 | +++ survex-1.2.6/configure |
| 110 | @@ -1,11 +1,9 @@ |
| 111 | #! /bin/sh |
| 112 | # Guess values for system-dependent variables and create Makefiles. |
| 113 | -# Generated by GNU Autoconf 2.68. |
| 114 | +# Generated by GNU Autoconf 2.69. |
| 115 | # |
| 116 | # |
| 117 | -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
| 118 | -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software |
| 119 | -# Foundation, Inc. |
| 120 | +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. |
| 121 | # |
| 122 | # |
| 123 | # This configure script is free software; the Free Software Foundation |
| 124 | @@ -134,6 +132,31 @@ export LANGUAGE |
| 125 | # CDPATH. |
| 126 | (unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
| 127 | |
| 128 | +# Use a proper internal environment variable to ensure we don't fall |
| 129 | + # into an infinite loop, continuously re-executing ourselves. |
| 130 | + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then |
| 131 | + _as_can_reexec=no; export _as_can_reexec; |
| 132 | + # We cannot yet assume a decent shell, so we have to provide a |
| 133 | +# neutralization value for shells without unset; and this also |
| 134 | +# works around shells that cannot unset nonexistent variables. |
| 135 | +# Preserve -v and -x to the replacement shell. |
| 136 | +BASH_ENV=/dev/null |
| 137 | +ENV=/dev/null |
| 138 | +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV |
| 139 | +case $- in # (((( |
| 140 | + *v*x* | *x*v* ) as_opts=-vx ;; |
| 141 | + *v* ) as_opts=-v ;; |
| 142 | + *x* ) as_opts=-x ;; |
| 143 | + * ) as_opts= ;; |
| 144 | +esac |
| 145 | +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} |
| 146 | +# Admittedly, this is quite paranoid, since all the known shells bail |
| 147 | +# out after a failed `exec'. |
| 148 | +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 |
| 149 | +as_fn_exit 255 |
| 150 | + fi |
| 151 | + # We don't want this to propagate to other subprocesses. |
| 152 | + { _as_can_reexec=; unset _as_can_reexec;} |
| 153 | if test "x$CONFIG_SHELL" = x; then |
| 154 | as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : |
| 155 | emulate sh |
| 156 | @@ -167,7 +190,8 @@ if ( set x; as_fn_ret_success y && test |
| 157 | else |
| 158 | exitcode=1; echo positional parameters were not saved. |
| 159 | fi |
| 160 | -test x\$exitcode = x0 || exit 1" |
| 161 | +test x\$exitcode = x0 || exit 1 |
| 162 | +test -x / || exit 1" |
| 163 | as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO |
| 164 | as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO |
| 165 | eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && |
| 166 | @@ -212,21 +236,25 @@ IFS=$as_save_IFS |
| 167 | |
| 168 | |
| 169 | if test "x$CONFIG_SHELL" != x; then : |
| 170 | - # We cannot yet assume a decent shell, so we have to provide a |
| 171 | - # neutralization value for shells without unset; and this also |
| 172 | - # works around shells that cannot unset nonexistent variables. |
| 173 | - # Preserve -v and -x to the replacement shell. |
| 174 | - BASH_ENV=/dev/null |
| 175 | - ENV=/dev/null |
| 176 | - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV |
| 177 | - export CONFIG_SHELL |
| 178 | - case $- in # (((( |
| 179 | - *v*x* | *x*v* ) as_opts=-vx ;; |
| 180 | - *v* ) as_opts=-v ;; |
| 181 | - *x* ) as_opts=-x ;; |
| 182 | - * ) as_opts= ;; |
| 183 | - esac |
| 184 | - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} |
| 185 | + export CONFIG_SHELL |
| 186 | + # We cannot yet assume a decent shell, so we have to provide a |
| 187 | +# neutralization value for shells without unset; and this also |
| 188 | +# works around shells that cannot unset nonexistent variables. |
| 189 | +# Preserve -v and -x to the replacement shell. |
| 190 | +BASH_ENV=/dev/null |
| 191 | +ENV=/dev/null |
| 192 | +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV |
| 193 | +case $- in # (((( |
| 194 | + *v*x* | *x*v* ) as_opts=-vx ;; |
| 195 | + *v* ) as_opts=-v ;; |
| 196 | + *x* ) as_opts=-x ;; |
| 197 | + * ) as_opts= ;; |
| 198 | +esac |
| 199 | +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} |
| 200 | +# Admittedly, this is quite paranoid, since all the known shells bail |
| 201 | +# out after a failed `exec'. |
| 202 | +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 |
| 203 | +exit 255 |
| 204 | fi |
| 205 | |
| 206 | if test x$as_have_required = xno; then : |
| 207 | @@ -328,6 +356,14 @@ $as_echo X"$as_dir" | |
| 208 | |
| 209 | |
| 210 | } # as_fn_mkdir_p |
| 211 | + |
| 212 | +# as_fn_executable_p FILE |
| 213 | +# ----------------------- |
| 214 | +# Test if FILE is an executable regular file. |
| 215 | +as_fn_executable_p () |
| 216 | +{ |
| 217 | + test -f "$1" && test -x "$1" |
| 218 | +} # as_fn_executable_p |
| 219 | # as_fn_append VAR VALUE |
| 220 | # ---------------------- |
| 221 | # Append the text in VALUE to the end of the definition contained in VAR. Take |
| 222 | @@ -449,6 +485,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits |
| 223 | chmod +x "$as_me.lineno" || |
| 224 | { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } |
| 225 | |
| 226 | + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have |
| 227 | + # already done that, so ensure we don't try to do so again and fall |
| 228 | + # in an infinite loop. This has already happened in practice. |
| 229 | + _as_can_reexec=no; export _as_can_reexec |
| 230 | # Don't try to exec as it changes $[0], causing all sort of problems |
| 231 | # (the dirname of $[0] is not the place where we might find the |
| 232 | # original and so on. Autoconf is especially sensitive to this). |
| 233 | @@ -483,16 +523,16 @@ if (echo >conf$$.file) 2>/dev/null; then |
| 234 | # ... but there are two gotchas: |
| 235 | # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. |
| 236 | # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. |
| 237 | - # In both cases, we have to default to `cp -p'. |
| 238 | + # In both cases, we have to default to `cp -pR'. |
| 239 | ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || |
| 240 | - as_ln_s='cp -p' |
| 241 | + as_ln_s='cp -pR' |
| 242 | elif ln conf$$.file conf$$ 2>/dev/null; then |
| 243 | as_ln_s=ln |
| 244 | else |
| 245 | - as_ln_s='cp -p' |
| 246 | + as_ln_s='cp -pR' |
| 247 | fi |
| 248 | else |
| 249 | - as_ln_s='cp -p' |
| 250 | + as_ln_s='cp -pR' |
| 251 | fi |
| 252 | rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file |
| 253 | rmdir conf$$.dir 2>/dev/null |
| 254 | @@ -504,28 +544,8 @@ else |
| 255 | as_mkdir_p=false |
| 256 | fi |
| 257 | |
| 258 | -if test -x / >/dev/null 2>&1; then |
| 259 | - as_test_x='test -x' |
| 260 | -else |
| 261 | - if ls -dL / >/dev/null 2>&1; then |
| 262 | - as_ls_L_option=L |
| 263 | - else |
| 264 | - as_ls_L_option= |
| 265 | - fi |
| 266 | - as_test_x=' |
| 267 | - eval sh -c '\'' |
| 268 | - if test -d "$1"; then |
| 269 | - test -d "$1/."; |
| 270 | - else |
| 271 | - case $1 in #( |
| 272 | - -*)set "./$1";; |
| 273 | - esac; |
| 274 | - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( |
| 275 | - ???[sx]*):;;*)false;;esac;fi |
| 276 | - '\'' sh |
| 277 | - ' |
| 278 | -fi |
| 279 | -as_executable_p=$as_test_x |
| 280 | +as_test_x='test -x' |
| 281 | +as_executable_p=as_fn_executable_p |
| 282 | |
| 283 | # Sed expression to map a string onto a valid CPP name. |
| 284 | as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" |
| 285 | @@ -1216,8 +1236,6 @@ target=$target_alias |
| 286 | if test "x$host_alias" != x; then |
| 287 | if test "x$build_alias" = x; then |
| 288 | cross_compiling=maybe |
| 289 | - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. |
| 290 | - If a cross compiler is detected then cross compile mode will be used" >&2 |
| 291 | elif test "x$build_alias" != "x$host_alias"; then |
| 292 | cross_compiling=yes |
| 293 | fi |
| 294 | @@ -1481,9 +1499,9 @@ test -n "$ac_init_help" && exit $ac_stat |
| 295 | if $ac_init_version; then |
| 296 | cat <<\_ACEOF |
| 297 | configure |
| 298 | -generated by GNU Autoconf 2.68 |
| 299 | +generated by GNU Autoconf 2.69 |
| 300 | |
| 301 | -Copyright (C) 2010 Free Software Foundation, Inc. |
| 302 | +Copyright (C) 2012 Free Software Foundation, Inc. |
| 303 | This configure script is free software; the Free Software Foundation |
| 304 | gives unlimited permission to copy, distribute and modify it. |
| 305 | _ACEOF |
| 306 | @@ -1744,7 +1762,7 @@ $as_echo "$ac_try_echo"; } >&5 |
| 307 | test ! -s conftest.err |
| 308 | } && test -s conftest$ac_exeext && { |
| 309 | test "$cross_compiling" = yes || |
| 310 | - $as_test_x conftest$ac_exeext |
| 311 | + test -x conftest$ac_exeext |
| 312 | }; then : |
| 313 | ac_retval=0 |
| 314 | else |
| 315 | @@ -2042,7 +2060,8 @@ int |
| 316 | main () |
| 317 | { |
| 318 | static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))]; |
| 319 | -test_array [0] = 0 |
| 320 | +test_array [0] = 0; |
| 321 | +return test_array [0]; |
| 322 | |
| 323 | ; |
| 324 | return 0; |
| 325 | @@ -2058,7 +2077,8 @@ main () |
| 326 | { |
| 327 | static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1) |
| 328 | < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))]; |
| 329 | -test_array [0] = 0 |
| 330 | +test_array [0] = 0; |
| 331 | +return test_array [0]; |
| 332 | |
| 333 | ; |
| 334 | return 0; |
| 335 | @@ -2095,7 +2115,7 @@ This file contains any messages produced |
| 336 | running configure, to aid debugging if configure makes a mistake. |
| 337 | |
| 338 | It was created by $as_me, which was |
| 339 | -generated by GNU Autoconf 2.68. Invocation command line was |
| 340 | +generated by GNU Autoconf 2.69. Invocation command line was |
| 341 | |
| 342 | $ $0 $@ |
| 343 | |
| 344 | @@ -2511,7 +2531,7 @@ case $as_dir/ in #(( |
| 345 | # by default. |
| 346 | for ac_prog in ginstall scoinst install; do |
| 347 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 348 | - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then |
| 349 | + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then |
| 350 | if test $ac_prog = install && |
| 351 | grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then |
| 352 | # AIX install. It has an incompatible calling convention. |
| 353 | @@ -2680,7 +2700,7 @@ do |
| 354 | IFS=$as_save_IFS |
| 355 | test -z "$as_dir" && as_dir=. |
| 356 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 357 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 358 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 359 | ac_cv_prog_STRIP="${ac_tool_prefix}strip" |
| 360 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 361 | break 2 |
| 362 | @@ -2720,7 +2740,7 @@ do |
| 363 | IFS=$as_save_IFS |
| 364 | test -z "$as_dir" && as_dir=. |
| 365 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 366 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 367 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 368 | ac_cv_prog_ac_ct_STRIP="strip" |
| 369 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 370 | break 2 |
| 371 | @@ -2771,7 +2791,7 @@ do |
| 372 | test -z "$as_dir" && as_dir=. |
| 373 | for ac_prog in mkdir gmkdir; do |
| 374 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 375 | - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue |
| 376 | + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue |
| 377 | case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( |
| 378 | 'mkdir (GNU coreutils) '* | \ |
| 379 | 'mkdir (coreutils) '* | \ |
| 380 | @@ -2824,7 +2844,7 @@ do |
| 381 | IFS=$as_save_IFS |
| 382 | test -z "$as_dir" && as_dir=. |
| 383 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 384 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 385 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 386 | ac_cv_prog_AWK="$ac_prog" |
| 387 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 388 | break 2 |
| 389 | @@ -3130,7 +3150,7 @@ do |
| 390 | IFS=$as_save_IFS |
| 391 | test -z "$as_dir" && as_dir=. |
| 392 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 393 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 394 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 395 | ac_cv_prog_CC="${ac_tool_prefix}gcc" |
| 396 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 397 | break 2 |
| 398 | @@ -3170,7 +3190,7 @@ do |
| 399 | IFS=$as_save_IFS |
| 400 | test -z "$as_dir" && as_dir=. |
| 401 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 402 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 403 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 404 | ac_cv_prog_ac_ct_CC="gcc" |
| 405 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 406 | break 2 |
| 407 | @@ -3223,7 +3243,7 @@ do |
| 408 | IFS=$as_save_IFS |
| 409 | test -z "$as_dir" && as_dir=. |
| 410 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 411 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 412 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 413 | ac_cv_prog_CC="${ac_tool_prefix}cc" |
| 414 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 415 | break 2 |
| 416 | @@ -3264,7 +3284,7 @@ do |
| 417 | IFS=$as_save_IFS |
| 418 | test -z "$as_dir" && as_dir=. |
| 419 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 420 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 421 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 422 | if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then |
| 423 | ac_prog_rejected=yes |
| 424 | continue |
| 425 | @@ -3322,7 +3342,7 @@ do |
| 426 | IFS=$as_save_IFS |
| 427 | test -z "$as_dir" && as_dir=. |
| 428 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 429 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 430 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 431 | ac_cv_prog_CC="$ac_tool_prefix$ac_prog" |
| 432 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 433 | break 2 |
| 434 | @@ -3366,7 +3386,7 @@ do |
| 435 | IFS=$as_save_IFS |
| 436 | test -z "$as_dir" && as_dir=. |
| 437 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 438 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 439 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 440 | ac_cv_prog_ac_ct_CC="$ac_prog" |
| 441 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 442 | break 2 |
| 443 | @@ -3812,8 +3832,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ |
| 444 | /* end confdefs.h. */ |
| 445 | #include <stdarg.h> |
| 446 | #include <stdio.h> |
| 447 | -#include <sys/types.h> |
| 448 | -#include <sys/stat.h> |
| 449 | +struct stat; |
| 450 | /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ |
| 451 | struct buf { int x; }; |
| 452 | FILE * (*rcsopen) (struct buf *, struct stat *, int); |
| 453 | @@ -4255,7 +4274,7 @@ do |
| 454 | IFS=$as_save_IFS |
| 455 | test -z "$as_dir" && as_dir=. |
| 456 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 457 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 458 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 459 | ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" |
| 460 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 461 | break 2 |
| 462 | @@ -4299,7 +4318,7 @@ do |
| 463 | IFS=$as_save_IFS |
| 464 | test -z "$as_dir" && as_dir=. |
| 465 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 466 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 467 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 468 | ac_cv_prog_ac_ct_CXX="$ac_prog" |
| 469 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 470 | break 2 |
| 471 | @@ -4951,7 +4970,7 @@ do |
| 472 | for ac_prog in grep ggrep; do |
| 473 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 474 | ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" |
| 475 | - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue |
| 476 | + as_fn_executable_p "$ac_path_GREP" || continue |
| 477 | # Check for GNU ac_path_GREP and select it if it is found. |
| 478 | # Check for GNU $ac_path_GREP |
| 479 | case `"$ac_path_GREP" --version 2>&1` in |
| 480 | @@ -5017,7 +5036,7 @@ do |
| 481 | for ac_prog in egrep; do |
| 482 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 483 | ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" |
| 484 | - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue |
| 485 | + as_fn_executable_p "$ac_path_EGREP" || continue |
| 486 | # Check for GNU ac_path_EGREP and select it if it is found. |
| 487 | # Check for GNU $ac_path_EGREP |
| 488 | case `"$ac_path_EGREP" --version 2>&1` in |
| 489 | @@ -5439,7 +5458,7 @@ do |
| 490 | IFS=$as_save_IFS |
| 491 | test -z "$as_dir" && as_dir=. |
| 492 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 493 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 494 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 495 | ac_cv_path_STRIP="$as_dir/$ac_word$ac_exec_ext" |
| 496 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 497 | break 2 |
| 498 | @@ -5482,7 +5501,7 @@ do |
| 499 | IFS=$as_save_IFS |
| 500 | test -z "$as_dir" && as_dir=. |
| 501 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 502 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 503 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 504 | ac_cv_path_ac_pt_STRIP="$as_dir/$ac_word$ac_exec_ext" |
| 505 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 506 | break 2 |
| 507 | @@ -6314,7 +6333,7 @@ do |
| 508 | IFS=$as_save_IFS |
| 509 | test -z "$as_dir" && as_dir=. |
| 510 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 511 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 512 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 513 | ac_cv_path_WX_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
| 514 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 515 | break 2 |
| 516 | @@ -6846,11 +6865,11 @@ else |
| 517 | int |
| 518 | main () |
| 519 | { |
| 520 | -/* FIXME: Include the comments suggested by Paul. */ |
| 521 | + |
| 522 | #ifndef __cplusplus |
| 523 | - /* Ultrix mips cc rejects this. */ |
| 524 | + /* Ultrix mips cc rejects this sort of thing. */ |
| 525 | typedef int charset[2]; |
| 526 | - const charset cs; |
| 527 | + const charset cs = { 0, 0 }; |
| 528 | /* SunOS 4.1.1 cc rejects this. */ |
| 529 | char const *const *pcpcc; |
| 530 | char **ppc; |
| 531 | @@ -6867,8 +6886,9 @@ main () |
| 532 | ++pcpcc; |
| 533 | ppc = (char**) pcpcc; |
| 534 | pcpcc = (char const *const *) ppc; |
| 535 | - { /* SCO 3.2v4 cc rejects this. */ |
| 536 | - char *t; |
| 537 | + { /* SCO 3.2v4 cc rejects this sort of thing. */ |
| 538 | + char tx; |
| 539 | + char *t = &tx; |
| 540 | char const *s = 0 ? (char *) 0 : (char const *) 0; |
| 541 | |
| 542 | *t++ = 0; |
| 543 | @@ -6884,10 +6904,10 @@ main () |
| 544 | iptr p = 0; |
| 545 | ++p; |
| 546 | } |
| 547 | - { /* AIX XL C 1.02.0.0 rejects this saying |
| 548 | + { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying |
| 549 | "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ |
| 550 | - struct s { int j; const int *ap[3]; }; |
| 551 | - struct s *b; b->j = 5; |
| 552 | + struct s { int j; const int *ap[3]; } bx; |
| 553 | + struct s *b = &bx; b->j = 5; |
| 554 | } |
| 555 | { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ |
| 556 | const int foo = 10; |
| 557 | @@ -7755,16 +7775,16 @@ if (echo >conf$$.file) 2>/dev/null; then |
| 558 | # ... but there are two gotchas: |
| 559 | # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. |
| 560 | # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. |
| 561 | - # In both cases, we have to default to `cp -p'. |
| 562 | + # In both cases, we have to default to `cp -pR'. |
| 563 | ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || |
| 564 | - as_ln_s='cp -p' |
| 565 | + as_ln_s='cp -pR' |
| 566 | elif ln conf$$.file conf$$ 2>/dev/null; then |
| 567 | as_ln_s=ln |
| 568 | else |
| 569 | - as_ln_s='cp -p' |
| 570 | + as_ln_s='cp -pR' |
| 571 | fi |
| 572 | else |
| 573 | - as_ln_s='cp -p' |
| 574 | + as_ln_s='cp -pR' |
| 575 | fi |
| 576 | rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file |
| 577 | rmdir conf$$.dir 2>/dev/null |
| 578 | @@ -7824,28 +7844,16 @@ else |
| 579 | as_mkdir_p=false |
| 580 | fi |
| 581 | |
| 582 | -if test -x / >/dev/null 2>&1; then |
| 583 | - as_test_x='test -x' |
| 584 | -else |
| 585 | - if ls -dL / >/dev/null 2>&1; then |
| 586 | - as_ls_L_option=L |
| 587 | - else |
| 588 | - as_ls_L_option= |
| 589 | - fi |
| 590 | - as_test_x=' |
| 591 | - eval sh -c '\'' |
| 592 | - if test -d "$1"; then |
| 593 | - test -d "$1/."; |
| 594 | - else |
| 595 | - case $1 in #( |
| 596 | - -*)set "./$1";; |
| 597 | - esac; |
| 598 | - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( |
| 599 | - ???[sx]*):;;*)false;;esac;fi |
| 600 | - '\'' sh |
| 601 | - ' |
| 602 | -fi |
| 603 | -as_executable_p=$as_test_x |
| 604 | + |
| 605 | +# as_fn_executable_p FILE |
| 606 | +# ----------------------- |
| 607 | +# Test if FILE is an executable regular file. |
| 608 | +as_fn_executable_p () |
| 609 | +{ |
| 610 | + test -f "$1" && test -x "$1" |
| 611 | +} # as_fn_executable_p |
| 612 | +as_test_x='test -x' |
| 613 | +as_executable_p=as_fn_executable_p |
| 614 | |
| 615 | # Sed expression to map a string onto a valid CPP name. |
| 616 | as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" |
| 617 | @@ -7867,7 +7875,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri |
| 618 | # values after options handling. |
| 619 | ac_log=" |
| 620 | This file was extended by $as_me, which was |
| 621 | -generated by GNU Autoconf 2.68. Invocation command line was |
| 622 | +generated by GNU Autoconf 2.69. Invocation command line was |
| 623 | |
| 624 | CONFIG_FILES = $CONFIG_FILES |
| 625 | CONFIG_HEADERS = $CONFIG_HEADERS |
| 626 | @@ -7933,10 +7941,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ |
| 627 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
| 628 | ac_cs_version="\\ |
| 629 | config.status |
| 630 | -configured by $0, generated by GNU Autoconf 2.68, |
| 631 | +configured by $0, generated by GNU Autoconf 2.69, |
| 632 | with options \\"\$ac_cs_config\\" |
| 633 | |
| 634 | -Copyright (C) 2010 Free Software Foundation, Inc. |
| 635 | +Copyright (C) 2012 Free Software Foundation, Inc. |
| 636 | This config.status script is free software; the Free Software Foundation |
| 637 | gives unlimited permission to copy, distribute and modify it." |
| 638 | |
| 639 | @@ -8027,7 +8035,7 @@ fi |
| 640 | _ACEOF |
| 641 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
| 642 | if \$ac_cs_recheck; then |
| 643 | - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion |
| 644 | + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion |
| 645 | shift |
| 646 | \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 |
| 647 | CONFIG_SHELL='$SHELL' |
| 648 | --- survex-1.2.6.orig/tests/Makefile.in |
| 649 | +++ survex-1.2.6/tests/Makefile.in |
| 650 | @@ -1,4 +1,4 @@ |
| 651 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. |
| 652 | +# Makefile.in generated by automake 1.11.5 from Makefile.am. |
| 653 | # @configure_input@ |
| 654 | |
| 655 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
| 656 | @@ -15,6 +15,23 @@ |
| 657 | |
| 658 | @SET_MAKE@ |
| 659 | VPATH = @srcdir@ |
| 660 | +am__make_dryrun = \ |
| 661 | + { \ |
| 662 | + am__dry=no; \ |
| 663 | + case $$MAKEFLAGS in \ |
| 664 | + *\\[\ \ ]*) \ |
| 665 | + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
| 666 | + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
| 667 | + *) \ |
| 668 | + for am__flg in $$MAKEFLAGS; do \ |
| 669 | + case $$am__flg in \ |
| 670 | + *=*|--*) ;; \ |
| 671 | + *n*) am__dry=yes; break;; \ |
| 672 | + esac; \ |
| 673 | + done;; \ |
| 674 | + esac; \ |
| 675 | + test $$am__dry = yes; \ |
| 676 | + } |
| 677 | pkgdatadir = $(datadir)/@PACKAGE@ |
| 678 | pkgincludedir = $(includedir)/@PACKAGE@ |
| 679 | pkglibdir = $(libdir)/@PACKAGE@ |
| 680 | @@ -46,6 +63,11 @@ CONFIG_CLEAN_FILES = |
| 681 | CONFIG_CLEAN_VPATH_FILES = |
| 682 | SOURCES = |
| 683 | DIST_SOURCES = |
| 684 | +am__can_run_installinfo = \ |
| 685 | + case $$AM_UPDATE_INFO_DIR in \ |
| 686 | + n|no|NO) false;; \ |
| 687 | + *) (install-info --version) >/dev/null 2>&1;; \ |
| 688 | + esac |
| 689 | am__tty_colors = \ |
| 690 | red=; grn=; lgn=; blu=; std= |
| 691 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
| 692 | @@ -270,9 +292,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi |
| 693 | exit 1;; \ |
| 694 | esac; \ |
| 695 | done; \ |
| 696 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \ |
| 697 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile'; \ |
| 698 | $(am__cd) $(top_srcdir) && \ |
| 699 | - $(AUTOMAKE) --gnu tests/Makefile |
| 700 | + $(AUTOMAKE) --foreign tests/Makefile |
| 701 | .PRECIOUS: Makefile |
| 702 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
| 703 | @case '$?' in \ |
| 704 | --- survex-1.2.6.orig/src/Makefile.in |
| 705 | +++ survex-1.2.6/src/Makefile.in |
| 706 | @@ -1,4 +1,4 @@ |
| 707 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. |
| 708 | +# Makefile.in generated by automake 1.11.5 from Makefile.am. |
| 709 | # @configure_input@ |
| 710 | |
| 711 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
| 712 | @@ -18,6 +18,23 @@ |
| 713 | |
| 714 | |
| 715 | VPATH = @srcdir@ |
| 716 | +am__make_dryrun = \ |
| 717 | + { \ |
| 718 | + am__dry=no; \ |
| 719 | + case $$MAKEFLAGS in \ |
| 720 | + *\\[\ \ ]*) \ |
| 721 | + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
| 722 | + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
| 723 | + *) \ |
| 724 | + for am__flg in $$MAKEFLAGS; do \ |
| 725 | + case $$am__flg in \ |
| 726 | + *=*|--*) ;; \ |
| 727 | + *n*) am__dry=yes; break;; \ |
| 728 | + esac; \ |
| 729 | + done;; \ |
| 730 | + esac; \ |
| 731 | + test $$am__dry = yes; \ |
| 732 | + } |
| 733 | pkgdatadir = $(datadir)/@PACKAGE@ |
| 734 | pkgincludedir = $(includedir)/@PACKAGE@ |
| 735 | pkglibdir = $(libdir)/@PACKAGE@ |
| 736 | @@ -54,7 +71,7 @@ mkinstalldirs = $(install_sh) -d |
| 737 | CONFIG_HEADER = $(top_builddir)/config.h |
| 738 | CONFIG_CLEAN_FILES = svxedit |
| 739 | CONFIG_CLEAN_VPATH_FILES = |
| 740 | -am__EXEEXT_1 = |
| 741 | +am__EXEEXT_1 = findentrances$(EXEEXT) |
| 742 | am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" |
| 743 | PROGRAMS = $(bin_PROGRAMS) |
| 744 | am__objects_1 = cmdline.$(OBJEXT) message.$(OBJEXT) filename.$(OBJEXT) \ |
| 745 | @@ -178,6 +195,11 @@ DIST_SOURCES = $(3dtopos_SOURCES) $(aven |
| 746 | $(cavern_SOURCES) $(diffpos_SOURCES) $(dump3d_SOURCES) \ |
| 747 | $(editwrap_SOURCES) $(extend_SOURCES) $(findentrances_SOURCES) \ |
| 748 | $(sorterr_SOURCES) |
| 749 | +am__can_run_installinfo = \ |
| 750 | + case $$AM_UPDATE_INFO_DIR in \ |
| 751 | + n|no|NO) false;; \ |
| 752 | + *) (install-info --version) >/dev/null 2>&1;; \ |
| 753 | + esac |
| 754 | HEADERS = $(noinst_HEADERS) |
| 755 | ETAGS = etags |
| 756 | CTAGS = ctags |
| 757 | @@ -420,9 +442,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi |
| 758 | exit 1;; \ |
| 759 | esac; \ |
| 760 | done; \ |
| 761 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ |
| 762 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ |
| 763 | $(am__cd) $(top_srcdir) && \ |
| 764 | - $(AUTOMAKE) --gnu src/Makefile |
| 765 | + $(AUTOMAKE) --foreign src/Makefile |
| 766 | .PRECIOUS: Makefile |
| 767 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
| 768 | @case '$?' in \ |
| 769 | @@ -445,8 +467,11 @@ svxedit: $(top_builddir)/config.status $ |
| 770 | cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ |
| 771 | install-binPROGRAMS: $(bin_PROGRAMS) |
| 772 | @$(NORMAL_INSTALL) |
| 773 | - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" |
| 774 | @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ |
| 775 | + if test -n "$$list"; then \ |
| 776 | + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ |
| 777 | + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ |
| 778 | + fi; \ |
| 779 | for p in $$list; do echo "$$p $$p"; done | \ |
| 780 | sed 's/$(EXEEXT)$$//' | \ |
| 781 | while read p p1; do if test -f $$p; \ |
| 782 | @@ -512,8 +537,11 @@ sorterr$(EXEEXT): $(sorterr_OBJECTS) $(s |
| 783 | $(LINK) $(sorterr_OBJECTS) $(sorterr_LDADD) $(LIBS) |
| 784 | install-binSCRIPTS: $(bin_SCRIPTS) |
| 785 | @$(NORMAL_INSTALL) |
| 786 | - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" |
| 787 | @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ |
| 788 | + if test -n "$$list"; then \ |
| 789 | + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ |
| 790 | + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ |
| 791 | + fi; \ |
| 792 | for p in $$list; do \ |
| 793 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
| 794 | if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ |
| 795 | --- survex-1.2.6.orig/vim/Makefile.in |
| 796 | +++ survex-1.2.6/vim/Makefile.in |
| 797 | @@ -1,4 +1,4 @@ |
| 798 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. |
| 799 | +# Makefile.in generated by automake 1.11.5 from Makefile.am. |
| 800 | # @configure_input@ |
| 801 | |
| 802 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
| 803 | @@ -16,6 +16,23 @@ |
| 804 | @SET_MAKE@ |
| 805 | |
| 806 | VPATH = @srcdir@ |
| 807 | +am__make_dryrun = \ |
| 808 | + { \ |
| 809 | + am__dry=no; \ |
| 810 | + case $$MAKEFLAGS in \ |
| 811 | + *\\[\ \ ]*) \ |
| 812 | + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
| 813 | + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
| 814 | + *) \ |
| 815 | + for am__flg in $$MAKEFLAGS; do \ |
| 816 | + case $$am__flg in \ |
| 817 | + *=*|--*) ;; \ |
| 818 | + *n*) am__dry=yes; break;; \ |
| 819 | + esac; \ |
| 820 | + done;; \ |
| 821 | + esac; \ |
| 822 | + test $$am__dry = yes; \ |
| 823 | + } |
| 824 | pkgdatadir = $(datadir)/@PACKAGE@ |
| 825 | pkgincludedir = $(includedir)/@PACKAGE@ |
| 826 | pkglibdir = $(libdir)/@PACKAGE@ |
| 827 | @@ -48,6 +65,11 @@ CONFIG_CLEAN_FILES = |
| 828 | CONFIG_CLEAN_VPATH_FILES = |
| 829 | SOURCES = |
| 830 | DIST_SOURCES = |
| 831 | +am__can_run_installinfo = \ |
| 832 | + case $$AM_UPDATE_INFO_DIR in \ |
| 833 | + n|no|NO) false;; \ |
| 834 | + *) (install-info --version) >/dev/null 2>&1;; \ |
| 835 | + esac |
| 836 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; |
| 837 | am__vpath_adj = case $$p in \ |
| 838 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ |
| 839 | @@ -228,9 +250,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi |
| 840 | exit 1;; \ |
| 841 | esac; \ |
| 842 | done; \ |
| 843 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu vim/Makefile'; \ |
| 844 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign vim/Makefile'; \ |
| 845 | $(am__cd) $(top_srcdir) && \ |
| 846 | - $(AUTOMAKE) --gnu vim/Makefile |
| 847 | + $(AUTOMAKE) --foreign vim/Makefile |
| 848 | .PRECIOUS: Makefile |
| 849 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
| 850 | @case '$?' in \ |
| 851 | @@ -251,15 +273,18 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) |
| 852 | $(am__aclocal_m4_deps): |
| 853 | install-nobase_dist_vimDATA: $(nobase_dist_vim_DATA) |
| 854 | @$(NORMAL_INSTALL) |
| 855 | - test -z "$(vimdir)" || $(MKDIR_P) "$(DESTDIR)$(vimdir)" |
| 856 | @list='$(nobase_dist_vim_DATA)'; test -n "$(vimdir)" || list=; \ |
| 857 | + if test -n "$$list"; then \ |
| 858 | + echo " $(MKDIR_P) '$(DESTDIR)$(vimdir)'"; \ |
| 859 | + $(MKDIR_P) "$(DESTDIR)$(vimdir)" || exit 1; \ |
| 860 | + fi; \ |
| 861 | $(am__nobase_list) | while read dir files; do \ |
| 862 | xfiles=; for file in $$files; do \ |
| 863 | if test -f "$$file"; then xfiles="$$xfiles $$file"; \ |
| 864 | else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \ |
| 865 | test -z "$$xfiles" || { \ |
| 866 | test "x$$dir" = x. || { \ |
| 867 | - echo "$(MKDIR_P) '$(DESTDIR)$(vimdir)/$$dir'"; \ |
| 868 | + echo " $(MKDIR_P) '$(DESTDIR)$(vimdir)/$$dir'"; \ |
| 869 | $(MKDIR_P) "$(DESTDIR)$(vimdir)/$$dir"; }; \ |
| 870 | echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(vimdir)/$$dir'"; \ |
| 871 | $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(vimdir)/$$dir" || exit $$?; }; \ |
| 872 | --- survex-1.2.6.orig/lib/Makefile.in |
| 873 | +++ survex-1.2.6/lib/Makefile.in |
| 874 | @@ -1,4 +1,4 @@ |
| 875 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. |
| 876 | +# Makefile.in generated by automake 1.11.5 from Makefile.am. |
| 877 | # @configure_input@ |
| 878 | |
| 879 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
| 880 | @@ -18,6 +18,23 @@ |
| 881 | # Makefile for survex support files |
| 882 | |
| 883 | VPATH = @srcdir@ |
| 884 | +am__make_dryrun = \ |
| 885 | + { \ |
| 886 | + am__dry=no; \ |
| 887 | + case $$MAKEFLAGS in \ |
| 888 | + *\\[\ \ ]*) \ |
| 889 | + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
| 890 | + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
| 891 | + *) \ |
| 892 | + for am__flg in $$MAKEFLAGS; do \ |
| 893 | + case $$am__flg in \ |
| 894 | + *=*|--*) ;; \ |
| 895 | + *n*) am__dry=yes; break;; \ |
| 896 | + esac; \ |
| 897 | + done;; \ |
| 898 | + esac; \ |
| 899 | + test $$am__dry = yes; \ |
| 900 | + } |
| 901 | pkgdatadir = $(datadir)/@PACKAGE@ |
| 902 | pkgincludedir = $(includedir)/@PACKAGE@ |
| 903 | pkglibdir = $(libdir)/@PACKAGE@ |
| 904 | @@ -58,6 +75,11 @@ RECURSIVE_TARGETS = all-recursive check- |
| 905 | install-pdf-recursive install-ps-recursive install-recursive \ |
| 906 | installcheck-recursive installdirs-recursive pdf-recursive \ |
| 907 | ps-recursive uninstall-recursive |
| 908 | +am__can_run_installinfo = \ |
| 909 | + case $$AM_UPDATE_INFO_DIR in \ |
| 910 | + n|no|NO) false;; \ |
| 911 | + *) (install-info --version) >/dev/null 2>&1;; \ |
| 912 | + esac |
| 913 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; |
| 914 | am__vpath_adj = case $$p in \ |
| 915 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ |
| 916 | @@ -280,9 +302,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi |
| 917 | exit 1;; \ |
| 918 | esac; \ |
| 919 | done; \ |
| 920 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/Makefile'; \ |
| 921 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/Makefile'; \ |
| 922 | $(am__cd) $(top_srcdir) && \ |
| 923 | - $(AUTOMAKE) --gnu lib/Makefile |
| 924 | + $(AUTOMAKE) --foreign lib/Makefile |
| 925 | .PRECIOUS: Makefile |
| 926 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
| 927 | @case '$?' in \ |
| 928 | @@ -307,8 +329,11 @@ Info.plist: $(top_builddir)/config.statu |
| 929 | cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ |
| 930 | install-dist_appsDATA: $(dist_apps_DATA) |
| 931 | @$(NORMAL_INSTALL) |
| 932 | - test -z "$(appsdir)" || $(MKDIR_P) "$(DESTDIR)$(appsdir)" |
| 933 | @list='$(dist_apps_DATA)'; test -n "$(appsdir)" || list=; \ |
| 934 | + if test -n "$$list"; then \ |
| 935 | + echo " $(MKDIR_P) '$(DESTDIR)$(appsdir)'"; \ |
| 936 | + $(MKDIR_P) "$(DESTDIR)$(appsdir)" || exit 1; \ |
| 937 | + fi; \ |
| 938 | for p in $$list; do \ |
| 939 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
| 940 | echo "$$d$$p"; \ |
| 941 | @@ -325,8 +350,11 @@ uninstall-dist_appsDATA: |
| 942 | dir='$(DESTDIR)$(appsdir)'; $(am__uninstall_files_from_dir) |
| 943 | install-dist_mimeDATA: $(dist_mime_DATA) |
| 944 | @$(NORMAL_INSTALL) |
| 945 | - test -z "$(mimedir)" || $(MKDIR_P) "$(DESTDIR)$(mimedir)" |
| 946 | @list='$(dist_mime_DATA)'; test -n "$(mimedir)" || list=; \ |
| 947 | + if test -n "$$list"; then \ |
| 948 | + echo " $(MKDIR_P) '$(DESTDIR)$(mimedir)'"; \ |
| 949 | + $(MKDIR_P) "$(DESTDIR)$(mimedir)" || exit 1; \ |
| 950 | + fi; \ |
| 951 | for p in $$list; do \ |
| 952 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
| 953 | echo "$$d$$p"; \ |
| 954 | @@ -343,8 +371,11 @@ uninstall-dist_mimeDATA: |
| 955 | dir='$(DESTDIR)$(mimedir)'; $(am__uninstall_files_from_dir) |
| 956 | install-dist_pkgdataDATA: $(dist_pkgdata_DATA) |
| 957 | @$(NORMAL_INSTALL) |
| 958 | - test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" |
| 959 | @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ |
| 960 | + if test -n "$$list"; then \ |
| 961 | + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \ |
| 962 | + $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \ |
| 963 | + fi; \ |
| 964 | for p in $$list; do \ |
| 965 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
| 966 | echo "$$d$$p"; \ |
| 967 | @@ -361,8 +392,11 @@ uninstall-dist_pkgdataDATA: |
| 968 | dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir) |
| 969 | install-mimeDATA: $(mime_DATA) |
| 970 | @$(NORMAL_INSTALL) |
| 971 | - test -z "$(mimedir)" || $(MKDIR_P) "$(DESTDIR)$(mimedir)" |
| 972 | @list='$(mime_DATA)'; test -n "$(mimedir)" || list=; \ |
| 973 | + if test -n "$$list"; then \ |
| 974 | + echo " $(MKDIR_P) '$(DESTDIR)$(mimedir)'"; \ |
| 975 | + $(MKDIR_P) "$(DESTDIR)$(mimedir)" || exit 1; \ |
| 976 | + fi; \ |
| 977 | for p in $$list; do \ |
| 978 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
| 979 | echo "$$d$$p"; \ |
| 980 | @@ -545,13 +579,10 @@ distdir: $(DISTFILES) |
| 981 | done |
| 982 | @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
| 983 | if test "$$subdir" = .; then :; else \ |
| 984 | - test -d "$(distdir)/$$subdir" \ |
| 985 | - || $(MKDIR_P) "$(distdir)/$$subdir" \ |
| 986 | - || exit 1; \ |
| 987 | - fi; \ |
| 988 | - done |
| 989 | - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
| 990 | - if test "$$subdir" = .; then :; else \ |
| 991 | + $(am__make_dryrun) \ |
| 992 | + || test -d "$(distdir)/$$subdir" \ |
| 993 | + || $(MKDIR_P) "$(distdir)/$$subdir" \ |
| 994 | + || exit 1; \ |
| 995 | dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ |
| 996 | $(am__relativize); \ |
| 997 | new_distdir=$$reldir; \ |
| 998 | --- survex-1.2.6.orig/lib/icons/Makefile.in |
| 999 | +++ survex-1.2.6/lib/icons/Makefile.in |
| 1000 | @@ -1,4 +1,4 @@ |
| 1001 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. |
| 1002 | +# Makefile.in generated by automake 1.11.5 from Makefile.am. |
| 1003 | # @configure_input@ |
| 1004 | |
| 1005 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
| 1006 | @@ -16,6 +16,23 @@ |
| 1007 | @SET_MAKE@ |
| 1008 | |
| 1009 | VPATH = @srcdir@ |
| 1010 | +am__make_dryrun = \ |
| 1011 | + { \ |
| 1012 | + am__dry=no; \ |
| 1013 | + case $$MAKEFLAGS in \ |
| 1014 | + *\\[\ \ ]*) \ |
| 1015 | + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
| 1016 | + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
| 1017 | + *) \ |
| 1018 | + for am__flg in $$MAKEFLAGS; do \ |
| 1019 | + case $$am__flg in \ |
| 1020 | + *=*|--*) ;; \ |
| 1021 | + *n*) am__dry=yes; break;; \ |
| 1022 | + esac; \ |
| 1023 | + done;; \ |
| 1024 | + esac; \ |
| 1025 | + test $$am__dry = yes; \ |
| 1026 | + } |
| 1027 | pkgdatadir = $(datadir)/@PACKAGE@ |
| 1028 | pkgincludedir = $(includedir)/@PACKAGE@ |
| 1029 | pkglibdir = $(libdir)/@PACKAGE@ |
| 1030 | @@ -48,6 +65,11 @@ CONFIG_CLEAN_FILES = |
| 1031 | CONFIG_CLEAN_VPATH_FILES = |
| 1032 | SOURCES = |
| 1033 | DIST_SOURCES = |
| 1034 | +am__can_run_installinfo = \ |
| 1035 | + case $$AM_UPDATE_INFO_DIR in \ |
| 1036 | + n|no|NO) false;; \ |
| 1037 | + *) (install-info --version) >/dev/null 2>&1;; \ |
| 1038 | + esac |
| 1039 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; |
| 1040 | am__vpath_adj = case $$p in \ |
| 1041 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ |
| 1042 | @@ -241,9 +263,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi |
| 1043 | exit 1;; \ |
| 1044 | esac; \ |
| 1045 | done; \ |
| 1046 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/icons/Makefile'; \ |
| 1047 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/icons/Makefile'; \ |
| 1048 | $(am__cd) $(top_srcdir) && \ |
| 1049 | - $(AUTOMAKE) --gnu lib/icons/Makefile |
| 1050 | + $(AUTOMAKE) --foreign lib/icons/Makefile |
| 1051 | .PRECIOUS: Makefile |
| 1052 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
| 1053 | @case '$?' in \ |
| 1054 | @@ -264,8 +286,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) |
| 1055 | $(am__aclocal_m4_deps): |
| 1056 | install-dist_iconDATA: $(dist_icon_DATA) |
| 1057 | @$(NORMAL_INSTALL) |
| 1058 | - test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)" |
| 1059 | @list='$(dist_icon_DATA)'; test -n "$(icondir)" || list=; \ |
| 1060 | + if test -n "$$list"; then \ |
| 1061 | + echo " $(MKDIR_P) '$(DESTDIR)$(icondir)'"; \ |
| 1062 | + $(MKDIR_P) "$(DESTDIR)$(icondir)" || exit 1; \ |
| 1063 | + fi; \ |
| 1064 | for p in $$list; do \ |
| 1065 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
| 1066 | echo "$$d$$p"; \ |
| 1067 | @@ -282,8 +307,11 @@ uninstall-dist_iconDATA: |
| 1068 | dir='$(DESTDIR)$(icondir)'; $(am__uninstall_files_from_dir) |
| 1069 | install-dist_pixmapsDATA: $(dist_pixmaps_DATA) |
| 1070 | @$(NORMAL_INSTALL) |
| 1071 | - test -z "$(pixmapsdir)" || $(MKDIR_P) "$(DESTDIR)$(pixmapsdir)" |
| 1072 | @list='$(dist_pixmaps_DATA)'; test -n "$(pixmapsdir)" || list=; \ |
| 1073 | + if test -n "$$list"; then \ |
| 1074 | + echo " $(MKDIR_P) '$(DESTDIR)$(pixmapsdir)'"; \ |
| 1075 | + $(MKDIR_P) "$(DESTDIR)$(pixmapsdir)" || exit 1; \ |
| 1076 | + fi; \ |
| 1077 | for p in $$list; do \ |
| 1078 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
| 1079 | echo "$$d$$p"; \ |
| 1080 | --- survex-1.2.6.orig/doc/Makefile.in |
| 1081 | +++ survex-1.2.6/doc/Makefile.in |
| 1082 | @@ -1,4 +1,4 @@ |
| 1083 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. |
| 1084 | +# Makefile.in generated by automake 1.11.5 from Makefile.am. |
| 1085 | # @configure_input@ |
| 1086 | |
| 1087 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
| 1088 | @@ -16,6 +16,23 @@ |
| 1089 | @SET_MAKE@ |
| 1090 | |
| 1091 | VPATH = @srcdir@ |
| 1092 | +am__make_dryrun = \ |
| 1093 | + { \ |
| 1094 | + am__dry=no; \ |
| 1095 | + case $$MAKEFLAGS in \ |
| 1096 | + *\\[\ \ ]*) \ |
| 1097 | + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
| 1098 | + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
| 1099 | + *) \ |
| 1100 | + for am__flg in $$MAKEFLAGS; do \ |
| 1101 | + case $$am__flg in \ |
| 1102 | + *=*|--*) ;; \ |
| 1103 | + *n*) am__dry=yes; break;; \ |
| 1104 | + esac; \ |
| 1105 | + done;; \ |
| 1106 | + esac; \ |
| 1107 | + test $$am__dry = yes; \ |
| 1108 | + } |
| 1109 | pkgdatadir = $(datadir)/@PACKAGE@ |
| 1110 | pkgincludedir = $(includedir)/@PACKAGE@ |
| 1111 | pkglibdir = $(libdir)/@PACKAGE@ |
| 1112 | @@ -49,6 +66,11 @@ CONFIG_CLEAN_FILES = index.htm survex.7 |
| 1113 | CONFIG_CLEAN_VPATH_FILES = |
| 1114 | SOURCES = |
| 1115 | DIST_SOURCES = |
| 1116 | +am__can_run_installinfo = \ |
| 1117 | + case $$AM_UPDATE_INFO_DIR in \ |
| 1118 | + n|no|NO) false;; \ |
| 1119 | + *) (install-info --version) >/dev/null 2>&1;; \ |
| 1120 | + esac |
| 1121 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; |
| 1122 | am__vpath_adj = case $$p in \ |
| 1123 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ |
| 1124 | @@ -251,9 +273,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi |
| 1125 | exit 1;; \ |
| 1126 | esac; \ |
| 1127 | done; \ |
| 1128 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ |
| 1129 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ |
| 1130 | $(am__cd) $(top_srcdir) && \ |
| 1131 | - $(AUTOMAKE) --gnu doc/Makefile |
| 1132 | + $(AUTOMAKE) --foreign doc/Makefile |
| 1133 | .PRECIOUS: Makefile |
| 1134 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
| 1135 | @case '$?' in \ |
| 1136 | @@ -280,11 +302,18 @@ version.ent: $(top_builddir)/config.stat |
| 1137 | cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ |
| 1138 | install-man1: $(man_MANS) |
| 1139 | @$(NORMAL_INSTALL) |
| 1140 | - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" |
| 1141 | - @list=''; test -n "$(man1dir)" || exit 0; \ |
| 1142 | - { for i in $$list; do echo "$$i"; done; \ |
| 1143 | - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ |
| 1144 | - sed -n '/\.1[a-z]*$$/p'; \ |
| 1145 | + @list1=''; \ |
| 1146 | + list2='$(man_MANS)'; \ |
| 1147 | + test -n "$(man1dir)" \ |
| 1148 | + && test -n "`echo $$list1$$list2`" \ |
| 1149 | + || exit 0; \ |
| 1150 | + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ |
| 1151 | + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ |
| 1152 | + { for i in $$list1; do echo "$$i"; done; \ |
| 1153 | + if test -n "$$list2"; then \ |
| 1154 | + for i in $$list2; do echo "$$i"; done \ |
| 1155 | + | sed -n '/\.1[a-z]*$$/p'; \ |
| 1156 | + fi; \ |
| 1157 | } | while read p; do \ |
| 1158 | if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ |
| 1159 | echo "$$d$$p"; echo "$$p"; \ |
| 1160 | @@ -316,11 +345,18 @@ uninstall-man1: |
| 1161 | dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) |
| 1162 | install-man5: $(man_MANS) |
| 1163 | @$(NORMAL_INSTALL) |
| 1164 | - test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)" |
| 1165 | - @list=''; test -n "$(man5dir)" || exit 0; \ |
| 1166 | - { for i in $$list; do echo "$$i"; done; \ |
| 1167 | - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ |
| 1168 | - sed -n '/\.5[a-z]*$$/p'; \ |
| 1169 | + @list1=''; \ |
| 1170 | + list2='$(man_MANS)'; \ |
| 1171 | + test -n "$(man5dir)" \ |
| 1172 | + && test -n "`echo $$list1$$list2`" \ |
| 1173 | + || exit 0; \ |
| 1174 | + echo " $(MKDIR_P) '$(DESTDIR)$(man5dir)'"; \ |
| 1175 | + $(MKDIR_P) "$(DESTDIR)$(man5dir)" || exit 1; \ |
| 1176 | + { for i in $$list1; do echo "$$i"; done; \ |
| 1177 | + if test -n "$$list2"; then \ |
| 1178 | + for i in $$list2; do echo "$$i"; done \ |
| 1179 | + | sed -n '/\.5[a-z]*$$/p'; \ |
| 1180 | + fi; \ |
| 1181 | } | while read p; do \ |
| 1182 | if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ |
| 1183 | echo "$$d$$p"; echo "$$p"; \ |
| 1184 | @@ -352,11 +388,18 @@ uninstall-man5: |
| 1185 | dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir) |
| 1186 | install-man7: $(man_MANS) |
| 1187 | @$(NORMAL_INSTALL) |
| 1188 | - test -z "$(man7dir)" || $(MKDIR_P) "$(DESTDIR)$(man7dir)" |
| 1189 | - @list=''; test -n "$(man7dir)" || exit 0; \ |
| 1190 | - { for i in $$list; do echo "$$i"; done; \ |
| 1191 | - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ |
| 1192 | - sed -n '/\.7[a-z]*$$/p'; \ |
| 1193 | + @list1=''; \ |
| 1194 | + list2='$(man_MANS)'; \ |
| 1195 | + test -n "$(man7dir)" \ |
| 1196 | + && test -n "`echo $$list1$$list2`" \ |
| 1197 | + || exit 0; \ |
| 1198 | + echo " $(MKDIR_P) '$(DESTDIR)$(man7dir)'"; \ |
| 1199 | + $(MKDIR_P) "$(DESTDIR)$(man7dir)" || exit 1; \ |
| 1200 | + { for i in $$list1; do echo "$$i"; done; \ |
| 1201 | + if test -n "$$list2"; then \ |
| 1202 | + for i in $$list2; do echo "$$i"; done \ |
| 1203 | + | sed -n '/\.7[a-z]*$$/p'; \ |
| 1204 | + fi; \ |
| 1205 | } | while read p; do \ |
| 1206 | if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ |
| 1207 | echo "$$d$$p"; echo "$$p"; \ |
| 1208 | @@ -388,8 +431,11 @@ uninstall-man7: |
| 1209 | dir='$(DESTDIR)$(man7dir)'; $(am__uninstall_files_from_dir) |
| 1210 | install-pkgdocDATA: $(pkgdoc_DATA) |
| 1211 | @$(NORMAL_INSTALL) |
| 1212 | - test -z "$(pkgdocdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdocdir)" |
| 1213 | @list='$(pkgdoc_DATA)'; test -n "$(pkgdocdir)" || list=; \ |
| 1214 | + if test -n "$$list"; then \ |
| 1215 | + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdocdir)'"; \ |
| 1216 | + $(MKDIR_P) "$(DESTDIR)$(pkgdocdir)" || exit 1; \ |
| 1217 | + fi; \ |
| 1218 | for p in $$list; do \ |
| 1219 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
| 1220 | echo "$$d$$p"; \ |