From 2cf972e16adc67dffcd724a2feb7bb233d6074ef Mon Sep 17 00:00:00 2001 From: Jeff Hobbs Date: Thu, 4 Dec 2008 18:20:00 +0000 Subject: [PATCH] * Makefile.in: change VPATH to ensure that configure munging of VPATH when configuring in the main directory does not break it. [Bug 2389466] --- ChangeLog | 6 ++++++ Makefile.in | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1922ba9..2ec1f43 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-12-04 Jeff Hobbs + + * 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 * 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 $@ -- 2.23.0