Updates to memcheck

[wxWidgets.git] / src / Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index c8f20c6335b2df08ee7610bb511ae5c1834db4fd..ac4c031a084614016d19038f6dcb0cae0b732741 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -48,11 +48,13 @@ install::
        @echo " "
        @echo "  Creating directories.."
        @$(WXBASEDIR)/mkinstalldirs \
        @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) \
+          $(bindir)

        @echo "  Copying headers from /include/wx"
        @cd $(WXBASEDIR)/include/wx ; \
        $(INSTALL) -d $(includedir)/wx ; \
        @echo "  Copying headers from /include/wx"
        @cd $(WXBASEDIR)/include/wx ; \
        $(INSTALL) -d $(includedir)/wx ; \


@@ -66,10 +68,7 @@ install::
        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 ; \
-       $(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 ; \
        @echo "  Copying headers from /include/wx/generic"
        @cd $(WXBASEDIR)/include/wx/generic ; \
        $(INSTALL) -d $(includedir)/wx/generic ; \


@@ -92,17 +91,18 @@ install::
        @cd $(WXBASEDIR)/lib/$(OS) ; \
          rm -f $(libdir)/$(STATIC_LIBRARY) ; \
          $(INSTALL_DATA) $(STATIC_LIBRARY) $(libdir)/$(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 -d $(SHARED_LIBRARY); then \
+         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 ; \
+       fi

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

-       

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