X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d8c838755a67d716ce5069847db1d5c74f145d72..520e470fdd0daef09c77938db642e4583933c90d:/src/Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index ac4c031a08..5caeef4a46 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -53,6 +53,7 @@ install::
 	   $(includedir)/wx/common \
 	   $(includedir)/wx/generic \
 	   $(includedir)/wx/protocol \
+	   $(libdir)/wx/include/wx/gtk \
 	   $(libdir) \
 	   $(bindir)
 	@echo "  Copying headers from /include/wx"
@@ -82,6 +83,9 @@ install::
 	  rm -f $(includedir)/wx/protocol/$$f ; \
 	  $(INSTALL_DATA) $$f $(includedir)/wx/protocol/$$f ; \
 	done
+	@echo "  Moving setup.h to library path"
+	@$(INSTALL) -d $(libdir)/wx/include/wx/gtk ;\
+	mv $(includedir)/wx/gtk/setup.h $(libdir)/wx/include/wx/gtk/setup.h ;
 	@echo "  Copying wx-config"
 	@cd $(WXBASEDIR) ; \
 	  $(INSTALL) -d $(bindir) ;\
@@ -91,16 +95,19 @@ install::
 	@cd $(WXBASEDIR)/lib/$(OS) ; \
 	  rm -f $(libdir)/$(STATIC_LIBRARY) ; \
 	  $(INSTALL_DATA) $(STATIC_LIBRARY) $(libdir)/$(STATIC_LIBRARY)
-	@if test -d $(SHARED_LIBRARY); then \
-	  echo "  Copying shared library" \
+	@if test -f $(WXBASEDIR)/lib/$(OS)/$(SHARED_LIBRARY) ; then \
+	  echo "  Copying shared library" ; \
 	  cd $(WXBASEDIR)/lib/$(OS) ; \
-	    rm -f $(libdir)/$(SHARED_LIBRARY) ; \
+	    rm -f $(libdir)/lib$(LIB_TARGET).so* ; \
 	    $(INSTALL_PROGRAM) $(SHARED_LIBRARY) $(libdir)/$(SHARED_LIBRARY) ; \
 	    $(LN_S) $(SHARED_LIBRARY) $(libdir)/lib$(LIB_TARGET).so.$(LIB_MAJOR) ; \
 	    $(LN_S) $(SHARED_LIBRARY) $(libdir)/lib$(LIB_TARGET).so ; \
+	    echo " " ; \
+	    echo "  You may have to run ldconfig!" ; \
+	    echo " " ; \
 	fi
 	@echo " "
-	@echo "Installation complete. You may have to run ldconfig!"
+	@echo "Installation complete."
 	@echo " "
 	
 clean::