From 337d7956cc2515114f1496152b07aa695f76d08b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Karsten=20Ball=C3=BCder?= Date: Wed, 9 Sep 1998 09:00:54 +0000 Subject: [PATCH] removed wxsetup.h from libdir git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/Makefile.in | 6 +++--- wx-config.in | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Makefile.in b/src/Makefile.in index c8f20c6..acf8182 100644 --- 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 83cff55..833b1af 100755 --- 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) -- 2.7.4