diff options
Diffstat (limited to 'x11-toolkits/wxgtk-devel/files/patch-src-makelib.env.in')
| -rw-r--r-- | x11-toolkits/wxgtk-devel/files/patch-src-makelib.env.in | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/x11-toolkits/wxgtk-devel/files/patch-src-makelib.env.in b/x11-toolkits/wxgtk-devel/files/patch-src-makelib.env.in index 0322453d05de..17ce4b33fced 100644 --- a/x11-toolkits/wxgtk-devel/files/patch-src-makelib.env.in +++ b/x11-toolkits/wxgtk-devel/files/patch-src-makelib.env.in @@ -1,20 +1,17 @@ ---- src/makelib.env.in.orig Tue Nov 4 05:00:26 2003 -+++ src/makelib.env.in Tue Nov 4 05:01:53 2003 -@@ -34,9 +34,10 @@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ +--- src/makelib.env.in.orig Sun Sep 21 18:31:38 2003 ++++ src/makelib.env.in Tue Nov 4 22:33:31 2003 +@@ -35,8 +35,8 @@ INSTALL_DATA = @INSTALL_DATA@ --TARGETLIB_STATIC = $(TARGET_LIBNAME).a + TARGETLIB_STATIC = $(TARGET_LIBNAME).a -TARGETLIB_SHARED = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT).$(LIBVERSION_REVISION).$(LIBVERSION_AGE) -TARGETLIB_LINK1 = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT) -+target_libname = $(TARGET_LIBNAME:-@WX_MAJOR_VERSION_NUMBER@.@WX_MINOR_VERSION_NUMBER@=) -+TARGETLIB_STATIC = $(target_libname).a -+TARGETLIB_SHARED = $(target_libname).so.$(LIBVERSION_CURRENT) -+TARGETLIB_LINK1 = $(target_libname).so ++TARGETLIB_SHARED = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT) ++TARGETLIB_LINK1 = $(TARGET_LIBNAME).so TARGETLIB_LINK2 = $(TARGET_LIBNAME).so TARGETLIB_SONAME = @WX_TARGET_LIBRARY_SONAME@ -@@ -72,9 +73,8 @@ +@@ -72,9 +72,8 @@ @$(INSTALL) -d $(top_builddir)/lib $(SHARED_LD) $@ $(TARGETLIB_SONAME) $(OBJECTS) $(LDFLAGS_VERSIONING) cd $(top_builddir)/lib \ @@ -26,7 +23,14 @@ $(top_builddir)/lib/$(TARGETLIB_STATIC): $(OBJECTS) @$(INSTALL) -d $(top_builddir)/lib -@@ -86,10 +86,9 @@ +@@ -82,14 +81,15 @@ + $(AR) $(AROPTIONS) $@ $(OBJECTS) + $(RANLIB) $@ + +-install: install_@WX_TARGET_LIBRARY_TYPE@ install_headers ++install: install_@WX_TARGET_LIBRARY_TYPE@ ++ ++install-common: install_headers install_so: $(INSTALL_PROGRAM) $(top_builddir)/lib/$(TARGETLIB_SHARED) $(libdir)/$(TARGETLIB_SHARED) @@ -39,7 +43,7 @@ install_a: $(INSTALL_PROGRAM) $(top_builddir)/lib/$(TARGETLIB_STATIC) $(libdir)/$(TARGETLIB_STATIC) -@@ -105,7 +104,6 @@ +@@ -105,7 +105,6 @@ $(RM) $(libdir)/$(TARGETLIB_STATIC) $(RM) $(libdir)/$(TARGETLIB_SHARED) $(RM) $(libdir)/$(TARGETLIB_LINK1) @@ -47,7 +51,7 @@ @echo "removing headers" @for h in $(HEADERS); do \ $(RM) $(includedir)/wx/$(HEADER_SUBDIR)/$$h; \ -@@ -118,7 +116,6 @@ +@@ -118,7 +117,6 @@ clean: $(RM) $(OBJECTS) $(top_builddir)/lib/$(TARGETLIB_SHARED) \ $(top_builddir)/lib/$(TARGETLIB_LINK1) \ |