* Makefile.in: change VPATH to ensure that configure munging of

	VPATH when configuring in the main directory does not break it.
	[Bug 2389466]

diff --git a/ChangeLog b/ChangeLog
index 1922ba9b38ca12bf7d66961ba22981e0d166235a..2ec1f43316031b711ceed356f12e839234db3701 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-04  Jeff Hobbs  <jeffh@ActiveState.com>
+
+       * Makefile.in: change VPATH to ensure that configure munging of
+       VPATH when configuring in the main directory does not break it.
+       [Bug 2389466]
+
 2008-12-03  Jeff Hobbs  <jeffh@ActiveState.com>
 
        * tests/vfsFtp.test: correct unmount ordering

diff --git a/Makefile.in b/Makefile.in
index 58ae674a28264638ea21e95393e3e60194137c38..4447a4fb8d43e3ed32e7d1ff8cd293849c804529 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -252,9 +252,12 @@ $(PKG_STUB_LIB_FILE): $(PKG_STUB_OBJECTS)
 # Setting the VPATH variable to a list of paths will cause the makefile
 # to look into these paths when resolving .c to .obj dependencies.
 # As necessary, add $(srcdir):$(srcdir)/compat:....
+#
+# The first $(srcdir) isn't necessary, but configure will strip it the
+# first $(srcdir) it sees in VPATH when configuring in the toplevel dir.
 #========================================================================
 
-VPATH = $(srcdir)/generic:$(srcdir)/unix:$(srcdir)/win
+VPATH = $(srcdir):$(srcdir)/generic
 
 .c.@OBJEXT@:
        $(COMPILE) -c `@CYGPATH@ $<` -o $@