svn commit: r1536536 - in /apr/apr/branches/1.5.x: ./ Makefile.in

[tr...@apache.org]

Author: trawick
Date: Mon Oct 28 21:52:33 2013
New Revision: 1536536

URL: http://svn.apache.org/r1536536
Log:
Merge r1529495 from trunk, omitted from the initial apr escape backport:

Include @EXEEXT@ in references to gen_test_char in autoconf-based
build in order to fix the build on Windows.

PR: 55628
Submitted by: Carlo Bramini <carlo.bramix libero.it>
Reviewed by: trawick

Modified:
    apr/apr/branches/1.5.x/   (props changed)
    apr/apr/branches/1.5.x/Makefile.in

Propchange: apr/apr/branches/1.5.x/
------------------------------------------------------------------------------
  Merged /apr/apr/trunk:r1529495

Modified: apr/apr/branches/1.5.x/Makefile.in
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/Makefile.in?rev=1536536&r1=1536535&r2=1536536&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/Makefile.in (original)
+++ apr/apr/branches/1.5.x/Makefile.in Mon Oct 28 21:52:33 2013
@@ -45,7 +45,7 @@ LT_VERSION = @LT_VERSION@
 @INCLUDE_OUTPUTS@
 
 CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \
-	build/apr_rules.out tools/gen_test_char
+	build/apr_rules.out tools/gen_test_char@EXEEXT@
 DISTCLEAN_TARGETS = config.cache config.log config.status \
 	include/apr.h include/arch/unix/apr_private.h \
 	libtool $(APR_CONFIG) build/apr_rules.mk apr.pc \
@@ -129,8 +129,8 @@ OBJECTS_gen_test_char = tools/gen_test_c
 tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char)
 	$(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
 
-include/private/apr_escape_test_char.h: tools/gen_test_char
-	tools/gen_test_char > include/private/apr_escape_test_char.h
+include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@
+	tools/gen_test_char@EXEEXT@ > $@
 
 LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LT_LDFLAGS) \
 	    @LT_NO_INSTALL@ $(ALL_LDFLAGS) -o $@