One that got away

[wxWidgets.git] / src / Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index 02b147b1336dcd1b3d6c47cb7f1f80b5bbe92a9b..5caeef4a469fe69d9db98c3f60e434452b041532 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -48,47 +48,68 @@ install::
        @echo " "
        @echo "  Creating directories.."
        @$(WXBASEDIR)/mkinstalldirs \
        @echo " "
        @echo "  Creating directories.."
        @$(WXBASEDIR)/mkinstalldirs \

-          /usr/local/include/wx \
-          /usr/local/include/wx/gtk \
-          /usr/local/include/wx/common \
-          /usr/local/include/wx/generic
+          $(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 ; \
        @echo "  Copying headers from /include/wx"
        @cd $(WXBASEDIR)/include/wx ; \

+       $(INSTALL) -d $(includedir)/wx ; \

        for f in *.h ; do \
          rm -f $(includedir)/wx/$$f ; \
          $(INSTALL_DATA) $$f $(includedir)/wx/$$f ; \
        done
        @echo "  Copying headers from /include/wx/gtk"
        @cd $(WXBASEDIR)/include/wx/gtk ; \
        for f in *.h ; do \
          rm -f $(includedir)/wx/$$f ; \
          $(INSTALL_DATA) $$f $(includedir)/wx/$$f ; \
        done
        @echo "  Copying headers from /include/wx/gtk"
        @cd $(WXBASEDIR)/include/wx/gtk ; \

+       $(INSTALL) -d $(includedir)/wx/gtk ; \

        for f in *.h ; do \
          rm -f $(includedir)/wx/gtk/$$f ; \
          $(INSTALL_DATA) $$f $(includedir)/wx/gtk/$$f ; \
        for f in *.h ; do \
          rm -f $(includedir)/wx/gtk/$$f ; \
          $(INSTALL_DATA) $$f $(includedir)/wx/gtk/$$f ; \

-       done
+       done ;

        @echo "  Copying headers from /include/wx/generic"
        @cd $(WXBASEDIR)/include/wx/generic ; \
        @echo "  Copying headers from /include/wx/generic"
        @cd $(WXBASEDIR)/include/wx/generic ; \

+       $(INSTALL) -d $(includedir)/wx/generic ; \

        for f in *.h ; do \
          rm -f $(includedir)/wx/generic/$$f ; \
          $(INSTALL_DATA) $$f $(includedir)/wx/generic/$$f ; \
        done
        for f in *.h ; do \
          rm -f $(includedir)/wx/generic/$$f ; \
          $(INSTALL_DATA) $$f $(includedir)/wx/generic/$$f ; \
        done

+       @echo "  Copying headers from /include/wx/protocol"
+       @cd $(WXBASEDIR)/include/wx/protocol ; \
+       for f in *.h ; do \
+         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) ; \
        @echo "  Copying wx-config"
        @cd $(WXBASEDIR) ; \

+         $(INSTALL) -d $(bindir) ;\

          rm -f $(bindir)/wx-config ; \
          $(INSTALL_PROGRAM) wx-config $(bindir)/wx-config
        @echo "  Copying static library"
        @cd $(WXBASEDIR)/lib/$(OS) ; \
          rm -f $(libdir)/$(STATIC_LIBRARY) ; \
          $(INSTALL_DATA) $(STATIC_LIBRARY) $(libdir)/$(STATIC_LIBRARY)
          rm -f $(bindir)/wx-config ; \
          $(INSTALL_PROGRAM) wx-config $(bindir)/wx-config
        @echo "  Copying static library"
        @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 " "

-       @echo "Installation complete. You may have to run ldconfig!"
+       @echo "Installation complete."

        @echo " "
        
        @echo " "
        

-       

 clean::
        $(RM) -rf gtk
        $(RM) -rf qt
 clean::
        $(RM) -rf gtk
        $(RM) -rf qt


@@ -137,4 +158,4 @@ lexer.c: ../common/lexer.l
        @$(RM) lexer.l
 
 clean::
        @$(RM) lexer.l
 
 clean::

-       
\ No newline at end of file
+