diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-01-30 09:41:34 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-01-30 09:41:34 +0000 |
| commit | 0428e986f06209f75419776b630d34e93080d57a (patch) | |
| tree | c9c9d2568452d95542b1d6461187e7548be116b7 /Build/source/utils/texdoctk | |
| parent | 27c9c2d0e7b7b11e85e6fbffb7ee0e0742d4daef (diff) | |
build system: Allow subdir-objects as required for Automake 1.14
git-svn-id: svn://tug.org/texlive/trunk@28989 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils/texdoctk')
| -rw-r--r-- | Build/source/utils/texdoctk/ChangeLog | 4 | ||||
| -rwxr-xr-x | Build/source/utils/texdoctk/configure | 5 | ||||
| -rw-r--r-- | Build/source/utils/texdoctk/configure.ac | 8 |
3 files changed, 11 insertions, 6 deletions
diff --git a/Build/source/utils/texdoctk/ChangeLog b/Build/source/utils/texdoctk/ChangeLog index aaff3729629..f0723c3e9f2 100644 --- a/Build/source/utils/texdoctk/ChangeLog +++ b/Build/source/utils/texdoctk/ChangeLog @@ -1,3 +1,7 @@ +2013-01-30 Peter Breitenlohner <peb@mppmu.mpg.de> + + * configure.ac: Use KPSE_COND_WIN32_WRAP for win32 wrappers. + 2012-12-29 Peter Breitenlohner <peb@mppmu.mpg.de> * configure.ac: Use KPSE_BASIC to enable silent rules. diff --git a/Build/source/utils/texdoctk/configure b/Build/source/utils/texdoctk/configure index 8b0072c3d91..c974095f7b5 100755 --- a/Build/source/utils/texdoctk/configure +++ b/Build/source/utils/texdoctk/configure @@ -3530,6 +3530,7 @@ else $as_echo "no, using $LN_S" >&6; } fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for native WIN32 or MINGW32" >&5 $as_echo_n "checking for native WIN32 or MINGW32... " >&6; } if ${kpse_cv_have_win32+:} false; then : @@ -3584,7 +3585,8 @@ else WIN32_FALSE= fi - if test -r $srcdir/../../texk/texlive/w32_wrapper/runscript.exe; then + + if test -r "$srcdir/../../texk/texlive/w32_wrapper/runscript.exe"; then WIN32_WRAP_TRUE= WIN32_WRAP_FALSE='#' else @@ -3593,6 +3595,7 @@ else fi + ac_config_files="$ac_config_files Makefile" diff --git a/Build/source/utils/texdoctk/configure.ac b/Build/source/utils/texdoctk/configure.ac index 6d958f5971f..0d36739299a 100644 --- a/Build/source/utils/texdoctk/configure.ac +++ b/Build/source/utils/texdoctk/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl Copyright (C) 2012 Karl Berry <tex-live@tug.org> +dnl Copyright (C) 2012, 2013 Karl Berry <tex-live@tug.org> dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, @@ -16,10 +16,8 @@ KPSE_BASIC([texdoctk]) # All scripts need these, apparently. AC_PROG_LN_S -KPSE_CHECK_WIN32 -AM_CONDITIONAL([WIN32], [test "x$kpse_cv_have_win32" != xno]) -AM_CONDITIONAL([WIN32_WRAP], - [test -r $srcdir/../../texk/texlive/w32_wrapper/runscript.exe]) + +KPSE_COND_WIN32_WRAP AC_CONFIG_FILES([Makefile]) |