X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8708fa7618baba4ef90051d09e4247339a6f9dde..953902913473763f359bc0fe7d81c88f7da3e184:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index bf616a6804..5549dcbe84 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -6972,12 +6972,12 @@ install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__in
 	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx
 	(cd ./ ; $(INSTALL_DATA)  lib/wx/include/$(TOOLCHAIN_NAME)/wx/setup.h $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx)
-	$(INSTALL_DIR) $(DESTDIR)$(includedir)
+	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5
 	for f in $(ALL_HEADERS); do \
-	if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
-	$(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
+	if test ! -d $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f` ; then \
+	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f`; \
 	fi; \
-	$(INSTALL_DATA) $(srcdir)/include//$$f $(DESTDIR)$(includedir)/$$f; \
+	$(INSTALL_DATA) $(srcdir)/include//$$f $(DESTDIR)$(includedir)/wx-2.5/$$f; \
 	done
 	@echo " "
 	@echo " ------------------------------------------------------"
@@ -7412,7 +7412,8 @@ samples:
 install-wxconfig: 
 	$(INSTALL_DIR) $(DESTDIR)$(bindir)
 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
-	$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_NAME) $(DESTDIR)$(libdir)/wx/config
+	$(INSTALL_PROGRAM) lib/wx/config/@WXCONFIG_DATA_FILE@ $(DESTDIR)$(libdir)/wx/config
+	(cd $(DESTDIR)$(libdir)/wx/config && rm -f $(TOOLCHAIN_NAME) && $(LN_S) @WXCONFIG_DATA_FILE@ $(TOOLCHAIN_NAME))
 	$(INSTALL_PROGRAM) wx-config $(DESTDIR)$(bindir)
 	(cd $(DESTDIR)$(bindir) && rm -f wx$(TOOLCHAIN_NAME)-config && $(LN_S) wx-config wx$(TOOLCHAIN_NAME)-config)