fix to include correct files.lst for wxUniv

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

diff --git a/Makefile.in b/Makefile.in
index 4a35dd171f27b9fefb14eadc8ec7a7963b137c4f..5aac04235328fb7e7e1a74f7173057454d3ec655 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -157,7 +157,7 @@ WX_LINGUAS = `cd $(top_srcdir)/locale && ls *.mo 2> /dev/null | sed -n 's/\.mo//
 # this line will include a file which defines ALL_SOURCES, ALL_OBJECTS,
 # ALL_DEPFILES and ALL_HEADERS variables with the complete list of .cpp, .o,
 # .d and .h/.inl files for the current toolkit
-include $(top_srcdir)/@PORT_FILES@
+include @PORT_FILES@
 
 SOURCES = $(ALL_SOURCES)
 HEADERS = $(ALL_HEADERS)

diff --git a/configure b/configure
index 4264211b04808476f0cec9fc34de67e90b545fcc..0a0e2e499bc88a4e644dfebfa4030bdeea5564ac 100755 (executable)
--- a/configure
+++ b/configure
@@ -10508,9 +10508,9 @@ rm -f conftest*
         ALL_DEPFILES="${ALL_DEPFILES} \$(HTMLDEPS)"
     fi
 
-        PORT_FILES="src/\$(TOOLKITDIR)/files.lst"
+        PORT_FILES="\${top_srcdir}/src/\$(TOOLKITDIR)/files.lst"
     if test "$wxUSE_UNIVERSAL" = "yes"; then
-                PORT_FILES="\${top_srcdir}/src/univ/files.lst ${PORT_FILES}"
+        PORT_FILES="${PORT_FILES} \${top_srcdir}/src/univ/files.lst"
     fi
     RPM_FILES="src/\$(TOOLKITDIR)/rpmfiles.lst"
     RPM_SPEC="wx\$(TOOLKIT).spec"

diff --git a/configure.in b/configure.in
index f76c5607b29fe6486044221eec3dd2c1a80c0a8e..8a23a6d14d1681b66805e6de08f067c6e4105103 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2056,10 +2056,9 @@ equivalent variable and GTK+ is version 1.2.3 or above.
     fi
 
     dnl misc other files depending on the port
-    PORT_FILES="src/\$(TOOLKITDIR)/files.lst"
+    PORT_FILES="\${top_srcdir}/src/\$(TOOLKITDIR)/files.lst"
     if test "$wxUSE_UNIVERSAL" = "yes"; then
-        dnl put univ files first!
-        PORT_FILES="\${top_srcdir}/src/univ/files.lst ${PORT_FILES}"
+        PORT_FILES="${PORT_FILES} \${top_srcdir}/src/univ/files.lst"
     fi
     RPM_FILES="src/\$(TOOLKITDIR)/rpmfiles.lst"
     RPM_SPEC="wx\$(TOOLKIT).spec"