diff options
Diffstat (limited to 'Build/source/texk/tex4htk')
-rw-r--r-- | Build/source/texk/tex4htk/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/tex4htk/Makefile.in | 19 | ||||
-rwxr-xr-x | Build/source/texk/tex4htk/configure | 4 | ||||
-rw-r--r-- | Build/source/texk/tex4htk/configure.ac | 7 |
4 files changed, 20 insertions, 14 deletions
diff --git a/Build/source/texk/tex4htk/ChangeLog b/Build/source/texk/tex4htk/ChangeLog index 7baa5d31c13..e67e6715a99 100644 --- a/Build/source/texk/tex4htk/ChangeLog +++ b/Build/source/texk/tex4htk/ChangeLog @@ -1,3 +1,7 @@ +2013-01-30 Peter Breitenlohner <peb@mppmu.mpg.de> + + * configure.ac: Use KPSE_COND_WIN32_WRAP. + 2013-01-08 Peter Breitenlohner <peb@mppmu.mpg.de> * t4ht.c, tex4ht.c: Drop set but unused variables. diff --git a/Build/source/texk/tex4htk/Makefile.in b/Build/source/texk/tex4htk/Makefile.in index 9d5f0659b09..c098c0fd2b1 100644 --- a/Build/source/texk/tex4htk/Makefile.in +++ b/Build/source/texk/tex4htk/Makefile.in @@ -594,22 +594,25 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tex4ht.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< diff --git a/Build/source/texk/tex4htk/configure b/Build/source/texk/tex4htk/configure index 1fdc73a7f06..cfe90b6026b 100755 --- a/Build/source/texk/tex4htk/configure +++ b/Build/source/texk/tex4htk/configure @@ -14546,7 +14546,8 @@ else WIN32_FALSE= fi - if test -r $srcdir/../texlive/w32_wrapper/runscript.exe; then + + if test -r "$srcdir/../../texk/texlive/w32_wrapper/runscript.exe"; then WIN32_WRAP_TRUE= WIN32_WRAP_FALSE='#' else @@ -14555,6 +14556,7 @@ else fi + ac_config_files="$ac_config_files Makefile" diff --git a/Build/source/texk/tex4htk/configure.ac b/Build/source/texk/tex4htk/configure.ac index b08753034f4..d06d8ecf39d 100644 --- a/Build/source/texk/tex4htk/configure.ac +++ b/Build/source/texk/tex4htk/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, @@ -21,10 +21,7 @@ AC_CHECK_SIZEOF([int]) KPSE_KPATHSEA_FLAGS -KPSE_CHECK_WIN32 -AM_CONDITIONAL([WIN32], [test "x$kpse_cv_have_win32" != xno]) -AM_CONDITIONAL([WIN32_WRAP], - [test -r $srcdir/../texlive/w32_wrapper/runscript.exe]) +KPSE_COND_WIN32_WRAP AC_CONFIG_FILES([Makefile]) |