package/x11/wxwidgets24/collision.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
   3 #
   4 # T2 SDE: package/.../wxwidgets24/collision.patch
   5 # Copyright (C) 2004 - 2005 The T2 SDE Project
   6 #
   7 # More information can be found in the files COPYING and README.
   8 #
   9 # This patch file is dual-licensed. It is available under the license the
  10 # patched project is licensed under, as long as it is an OpenSource license
  11 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12 # of the GNU General Public License as published by the Free Software
  13 # Foundation; either version 2 of the License, or (at your option) any later
  14 # version.
  15 # --- T2-COPYRIGHT-NOTE-END ---
  16
  17 --- wxPythonSrc-2.4.2.4_orig/Makefile.in        2003-07-28 18:06:13.000000000 +0200
  18 +++ wxPythonSrc-2.4.2.4/Makefile.in     2005-03-31 22:52:16.345490488 +0200
  19 @@ -394,7 +394,6 @@
  20
  21  m4datainstall: preinstall
  22         $(INSTALL) -d $(datadir)/aclocal
  23 -       $(INSTALL_DATA) $(top_srcdir)/wxwin.m4 $(datadir)/aclocal
  24
  25  win32install: preinstall
  26         $(INSTALL) -d $(includedir)/wx/msw
  27 @@ -420,7 +419,6 @@
  28         @if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
  29
  30         $(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLCHAIN_NAME@-config $(bindir)/wx@TOOLCHAIN_NAME@-config
  31 -       cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx-config
  32         @INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
  33         @if test "x@WX_LIBRARY_IMPORTLIB@" != "x"; then \
  34                 $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_IMPORTLIB@ $(libdir)/@WX_LIBRARY_IMPORTLIB@; fi