diff options
Diffstat (limited to 'x11-toolkits/wxgtk-devel/files/patch-ac')
| -rw-r--r-- | x11-toolkits/wxgtk-devel/files/patch-ac | 61 |
1 files changed, 40 insertions, 21 deletions
diff --git a/x11-toolkits/wxgtk-devel/files/patch-ac b/x11-toolkits/wxgtk-devel/files/patch-ac index 6af51255b4b9..ae25a9c7982d 100644 --- a/x11-toolkits/wxgtk-devel/files/patch-ac +++ b/x11-toolkits/wxgtk-devel/files/patch-ac @@ -1,41 +1,60 @@ ---- Makefile.in.orig Fri Jan 14 09:27:03 2000 -+++ Makefile.in Fri Jan 14 09:27:48 2000 -@@ -2050,19 +2050,11 @@ +--- Makefile.in.orig Wed Mar 22 13:12:38 2000 ++++ Makefile.in Sun Apr 23 08:08:08 2000 +@@ -311,39 +311,23 @@ CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@ @$(RM) ./lib/@WX_LIBRARY_LINK1@ - @$(RM) ./lib/@WX_LIBRARY_LINK2@ - @$(RM) ./lib/@WX_LIBRARY_LINK3@ - $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK1@ -- $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK2@ -- $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK3@ + cd lib \ +- && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@ \ +- && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@ \ +- && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK3@ ++ && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@ - CREATE_INSTALLED_LINKS: $(libdir)/@WX_LIBRARY_NAME_SHARED@ + CREATE_LINKS_GL: @WX_LIBRARY_NAME_SHARED_GL@ + @$(RM) ./lib/@WX_LIBRARY_LINK1_GL@ +- @$(RM) ./lib/@WX_LIBRARY_LINK2_GL@ +- @$(RM) ./lib/@WX_LIBRARY_LINK3_GL@ + cd lib \ +- && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@ \ +- && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@ \ +- && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK3_GL@ ++ && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@ + + CREATE_INSTALLED_LINKS: preinstall $(RM) $(libdir)/@WX_LIBRARY_LINK1@ - $(RM) $(libdir)/@WX_LIBRARY_LINK2@ - $(RM) $(libdir)/@WX_LIBRARY_LINK3@ - $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK1@ -- $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK2@ -- $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK3@ + cd $(libdir) \ +- && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ \ +- && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@ \ +- && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK3@ ++ && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ + + CREATE_INSTALLED_LINKS_GL: preinstall_gl + $(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@ +- $(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@ +- $(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@ + cd $(libdir) \ +- && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ \ +- && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@ \ +- && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK3_GL@ ++ && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ $(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h -@@ -2115,9 +2107,7 @@ - $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm - - $(INSTALL) -d $(includedir)/wx -- $(INSTALL) -d $(includedir)/wx/msw - $(INSTALL) -d $(includedir)/wx/gtk -- $(INSTALL) -d $(includedir)/wx/motif - $(INSTALL) -d $(includedir)/wx/html - $(INSTALL) -d $(includedir)/wx/protocol - $(INSTALL) -d $(includedir)/wx/unix -@@ -2148,8 +2138,6 @@ +@@ -437,13 +421,9 @@ @echo " Removing library..." @$(RM) $(libdir)/@WX_TARGET_LIBRARY@ @$(RM) $(libdir)/@WX_LIBRARY_LINK1@ - @$(RM) $(libdir)/@WX_LIBRARY_LINK2@ - @$(RM) $(libdir)/@WX_LIBRARY_LINK3@ + @echo " Removing GL library..." + @$(RM) $(libdir)/@WX_TARGET_LIBRARY_GL@ + @$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@ +- @$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@ +- @$(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@ @echo " Removing helper files..." @$(RM) $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h @$(RM) $(bindir)/wx-config |