removed wxsetup.h from libdir

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

diff --git a/src/Makefile.in b/src/Makefile.in
index c8f20c6335b2df08ee7610bb511ae5c1834db4fd..acf8182d8e02bee30ae5ad2c7dd3dd0ecb58d6a1 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -67,9 +67,8 @@ install::
          rm -f $(includedir)/wx/gtk/$$f ; \
          $(INSTALL_DATA) $$f $(includedir)/wx/gtk/$$f ; \
        done ; \
-       $(INSTALL) -d $(libdir) ;\
-       mv $(includedir)/wx/gtk/setup.h $(libdir)/wxsetup.h ;\
-       ln -s $(libdir)/wxsetup.h $(includedir)/wx/gtk/setup.h
+       $(INSTALL) -d $(includedir)/wx/@host@/wx/gtk ;\
+       mv $(includedir)/wx/gtk/setup.h $(includedir)/wx/@host@/wx/gtk/setup.h ;\
        @echo "  Copying headers from /include/wx/generic"
        @cd $(WXBASEDIR)/include/wx/generic ; \
        $(INSTALL) -d $(includedir)/wx/generic ; \
@@ -89,6 +88,7 @@ install::
          rm -f $(bindir)/wx-config ; \
          $(INSTALL_PROGRAM) wx-config $(bindir)/wx-config
        @echo "  Copying static library"
+       $(INSTALL) -d $(libdir) ;\
        @cd $(WXBASEDIR)/lib/$(OS) ; \
          rm -f $(libdir)/$(STATIC_LIBRARY) ; \
          $(INSTALL_DATA) $(STATIC_LIBRARY) $(libdir)/$(STATIC_LIBRARY)

diff --git a/wx-config.in b/wx-config.in
index 83cff55b82b70ce932c85d3f70bf301d40c92c7b..833b1af37aeee46208311dcc2af711d01a2e5722 100755 (executable)
--- a/wx-config.in
+++ b/wx-config.in
@@ -42,6 +42,7 @@ while test $# -gt 0; do
       if test @includedir@ != /usr/include ; then
         includes=-I@includedir@
       fi
+      includes="$includes -I@includedir@/@host@/wx"
       echo $includes -D@TOOLKIT_DEF@ @GUI_TK_INCLUDE@
       ;;
     --libs)