SN: Replaced more ':' in VPATH statements by PATH_IFS (to make

        wxGTK/wxMotif/wxPM compile without editing generated Makefiles
        on OS/2), including a ':' in a comment, so this time this
        hopefully will not break anything.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5403 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in
index 96af3cf06ca01589320f1790530275b80cae09a5..ed5f74b03dc779080be2878fe3abe7f6a123e9c2 100644 (file)
--- a/samples/sockets/Makefile.in
+++ b/samples/sockets/Makefile.in
@@ -12,7 +12,10 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 program_dir = samples/wxsocket
 top_srcdir = @top_srcdir@
 top_builddir = ../..
 program_dir = samples/wxsocket

-VPATH = :$(top_srcdir)/samples/wxsocket
+# the comment at the end of the next line is needed because otherwise autoconf
+# would remove this line completely - it contains a built-in hack to remove
+# any VPATH assignment not containing ':'
+VPATH = @PATH_IFS@$(top_srcdir)/samples/wxsocket # ':' for autoconf

 
 # Clears all default suffixes
 .SUFFIXES:     .o .cpp .c .cxx
 
 # Clears all default suffixes
 .SUFFIXES:     .o .cpp .c .cxx

diff --git a/src/makeprog.env.in b/src/makeprog.env.in
index e529f590f172e73ac11a197cd7a9280328770565..a875d3ee7bfd0291ef6d920d749dbd92b865863c 100644 (file)
--- a/src/makeprog.env.in
+++ b/src/makeprog.env.in
@@ -16,7 +16,10 @@ BIN_PROGRAM = $(PROGRAM)$(PROGRAM_EXT)
 .cxx.o :
        $(CC) -c $(CPPFLAGS) -o $@ $<
 
 .cxx.o :
        $(CC) -c $(CPPFLAGS) -o $@ $<
 

-VPATH = :$(top_srcdir)/$(program_dir)
+# the comment at the end of the next line is needed because otherwise autoconf
+# would remove this line completely - it contains a built-in hack to remove
+# any VPATH assignment not containing ':'
+VPATH = @PATH_IFS@$(top_srcdir)/$(program_dir) # ':' for autoconf

 
 # Set defaults from configure
 include $(top_builddir)/src/make.env
 
 # Set defaults from configure
 include $(top_builddir)/src/make.env