removed wxsetup.h from libdir
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -67,9 +67,8 @@ install::
|
|||||||
rm -f $(includedir)/wx/gtk/$$f ; \
|
rm -f $(includedir)/wx/gtk/$$f ; \
|
||||||
$(INSTALL_DATA) $$f $(includedir)/wx/gtk/$$f ; \
|
$(INSTALL_DATA) $$f $(includedir)/wx/gtk/$$f ; \
|
||||||
done ; \
|
done ; \
|
||||||
$(INSTALL) -d $(libdir) ;\
|
$(INSTALL) -d $(includedir)/wx/@host@/wx/gtk ;\
|
||||||
mv $(includedir)/wx/gtk/setup.h $(libdir)/wxsetup.h ;\
|
mv $(includedir)/wx/gtk/setup.h $(includedir)/wx/@host@/wx/gtk/setup.h ;\
|
||||||
ln -s $(libdir)/wxsetup.h $(includedir)/wx/gtk/setup.h
|
|
||||||
@echo " Copying headers from /include/wx/generic"
|
@echo " Copying headers from /include/wx/generic"
|
||||||
@cd $(WXBASEDIR)/include/wx/generic ; \
|
@cd $(WXBASEDIR)/include/wx/generic ; \
|
||||||
$(INSTALL) -d $(includedir)/wx/generic ; \
|
$(INSTALL) -d $(includedir)/wx/generic ; \
|
||||||
@@ -89,6 +88,7 @@ install::
|
|||||||
rm -f $(bindir)/wx-config ; \
|
rm -f $(bindir)/wx-config ; \
|
||||||
$(INSTALL_PROGRAM) wx-config $(bindir)/wx-config
|
$(INSTALL_PROGRAM) wx-config $(bindir)/wx-config
|
||||||
@echo " Copying static library"
|
@echo " Copying static library"
|
||||||
|
$(INSTALL) -d $(libdir) ;\
|
||||||
@cd $(WXBASEDIR)/lib/$(OS) ; \
|
@cd $(WXBASEDIR)/lib/$(OS) ; \
|
||||||
rm -f $(libdir)/$(STATIC_LIBRARY) ; \
|
rm -f $(libdir)/$(STATIC_LIBRARY) ; \
|
||||||
$(INSTALL_DATA) $(STATIC_LIBRARY) $(libdir)/$(STATIC_LIBRARY)
|
$(INSTALL_DATA) $(STATIC_LIBRARY) $(libdir)/$(STATIC_LIBRARY)
|
||||||
|
@@ -42,6 +42,7 @@ while test $# -gt 0; do
|
|||||||
if test @includedir@ != /usr/include ; then
|
if test @includedir@ != /usr/include ; then
|
||||||
includes=-I@includedir@
|
includes=-I@includedir@
|
||||||
fi
|
fi
|
||||||
|
includes="$includes -I@includedir@/@host@/wx"
|
||||||
echo $includes -D@TOOLKIT_DEF@ @GUI_TK_INCLUDE@
|
echo $includes -D@TOOLKIT_DEF@ @GUI_TK_INCLUDE@
|
||||||
;;
|
;;
|
||||||
--libs)
|
--libs)
|
||||||
|
Reference in New Issue
Block a user