From: Jeff Hobbs <hobbs@users.sourceforge.net>
Date: Thu, 4 Dec 2008 18:20:00 +0000 (+0000)
Subject: 	* Makefile.in: change VPATH to ensure that configure munging of
X-Git-Url: http://privyetmir.co.uk/gitweb?a=commitdiff_plain;h=2cf972e16adc67dffcd724a2feb7bb233d6074ef;p=tclvfs

	* 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 1922ba9..2ec1f43 100644
--- 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 58ae674..4447a4f 100644
--- 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 $@