X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a665764c39f1dc8ce32170a52f2daa8e2fa38342..520e470fdd0daef09c77938db642e4583933c90d:/src/Makefile.in?ds=sidebyside

diff --git a/src/Makefile.in b/src/Makefile.in
index c8f20c6335..5caeef4a46 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -48,11 +48,14 @@ install::
 	@echo " "
 	@echo "  Creating directories.."
 	@$(WXBASEDIR)/mkinstalldirs \
-	   @prefix@/include/wx \
-	   @prefix@/include/wx/gtk \
-	   @prefix@/include/wx/common \
-	   @prefix@/include/wx/generic \
-	   @prefix@/include/wx/protocol \
+	   $(includedir)/wx \
+	   $(includedir)/wx/gtk \
+	   $(includedir)/wx/common \
+	   $(includedir)/wx/generic \
+	   $(includedir)/wx/protocol \
+	   $(libdir)/wx/include/wx/gtk \
+	   $(libdir) \
+	   $(bindir)
 	@echo "  Copying headers from /include/wx"
 	@cd $(WXBASEDIR)/include/wx ; \
 	$(INSTALL) -d $(includedir)/wx ; \
@@ -66,10 +69,7 @@ install::
 	for f in *.h ; do \
 	  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
+	done ;
 	@echo "  Copying headers from /include/wx/generic"
 	@cd $(WXBASEDIR)/include/wx/generic ; \
 	$(INSTALL) -d $(includedir)/wx/generic ; \
@@ -83,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) ;\
@@ -92,17 +95,21 @@ install::
 	@cd $(WXBASEDIR)/lib/$(OS) ; \
 	  rm -f $(libdir)/$(STATIC_LIBRARY) ; \
 	  $(INSTALL_DATA) $(STATIC_LIBRARY) $(libdir)/$(STATIC_LIBRARY)
-	@echo "  Copying shared library"
-	@cd $(WXBASEDIR)/lib/$(OS) ; \
-	  rm -f $(libdir)/$(SHARED_LIBRARY) ; \
-	  $(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
+	@if test -f $(WXBASEDIR)/lib/$(OS)/$(SHARED_LIBRARY) ; then \
+	  echo "  Copying shared library" ; \
+	  cd $(WXBASEDIR)/lib/$(OS) ; \
+	    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::
 	$(RM) -rf gtk
 	$(RM) -rf qt