latest changes (no need for link to Makefile.am any more)

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

configure

@@ -8634,7 +8634,7 @@ LIBTOOL="$LIBTOOL --silent"
 
 
 SETUPH_DIR=include/wx/${TOOLKIT_DIR}
-mkdir -p ${SETUPH_DIR}
+
 
 
 
@@ -8921,6 +8921,7 @@ s%@DOCS_SUBDIRS@%$DOCS_SUBDIRS%g
 s%@SAMPLES_SUBDIRS@%$SAMPLES_SUBDIRS%g
 s%@USER_SUBDIRS@%$USER_SUBDIRS%g
 s%@EXTRA_LIBS@%$EXTRA_LIBS%g
+s%@SETUPH_DIR@%$SETUPH_DIR%g
 
 CEOF
 EOF
@@ -9189,11 +9190,16 @@ fi; done
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
-SETUPH_DIR=${SETUPH_DIR}
+
+            SETUPH_DIR=${SETUPH_DIR}
+          
+         
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 test -z "$CONFIG_HEADERS" || echo timestamp > ${SETUPH_DIR}/stamp-h
-chmod +x wx-config
+
+            chmod +x wx-config
+          
 exit 0
 EOF
 chmod +x $CONFIG_STATUS

configure.in

@@ -1931,7 +1931,7 @@ AC_SUBST(LIBS)
 
 dnl create the configuration header file from the template
 SETUPH_DIR=include/wx/${TOOLKIT_DIR}
-mkdir -p ${SETUPH_DIR}
+AC_SUBST(SETUPH_DIR)
 AM_CONFIG_HEADER(${SETUPH_DIR}/setup.h:include/wx/unix/setup.h.in)
 
 dnl MAKE_SET will be replaced with "MAKE=..." or nothing if make sets MAKE
@@ -2002,5 +2002,11 @@ AC_OUTPUT([
             samples/wxpoem/Makefile
             samples/wxsocket/Makefile
           ],
-          [chmod +x wx-config], [SETUPH_DIR=${SETUPH_DIR}])
+          [
+            chmod +x wx-config
+          ],
+          [
+            SETUPH_DIR=${SETUPH_DIR}
+          ]
+         )
 

src/Makefile.am

@@ -9,7 +9,7 @@ SUFFIXES = .cpp
 DEFS = $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)
 LIBS = $(GUILIBS)
 
-VPATH = .:$(srcdir)/common:$(srcdir)/@TOOLKIT_DIR@:$(srcdir)/generic:$(EXTRA_VPATH)
+VPATH = .:${srcdir}:$(srcdir)/common:$(srcdir)/@TOOLKIT_DIR@:$(srcdir)/generic:$(EXTRA_VPATH)
 
 lib_LTLIBRARIES = libwx_@WX_LIBRARY@.la