To regenerate the patch, get the full wxWidgets tarball, copy build/bakefiles
and the various *.bkl files into the wxGTK tree and run
./bakefile_gen -f autoconf
in build/bakefiles. manual-bakefile.diff contains the necessary patch for
the bakefile ruleset to use libtool.
diff -uNr wxWidgets-2.8.10.orig/build/bakefiles/regex.bkl wxWidgets-2.8.10/build/bakefiles/regex.bkl
--- wxWidgets-2.8.10.orig/build/bakefiles/regex.bkl 2009-03-06 13:10:54.000000000 +0100
+++ wxWidgets-2.8.10/build/bakefiles/regex.bkl 2009-03-22 20:09:05.000000000 +0100
@@ -27,16 +27,13 @@
$(TOP_SRCDIR)src/regex
-
-
- $(id)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-
-
- $(id)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX)
-
- $(TOP_SRCDIR)include
- $(SETUPHDIR)
+
+ $(id)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)
+
+ $(WX_VERSION)
+ $(WXSOVERSION)
__WX$(TOOLKIT)__
$(WXUNIV_DEFINE)
$(UNICODE_DEFINE)
@@ -49,6 +46,6 @@
src/regex/regerror.c
src/regex/regfree.c
-
+
diff -uNr wxWidgets-2.8.10.orig/build/bakefiles/wx.bkl wxWidgets-2.8.10/build/bakefiles/wx.bkl
--- wxWidgets-2.8.10.orig/build/bakefiles/wx.bkl 2009-03-06 13:10:54.000000000 +0100
+++ wxWidgets-2.8.10/build/bakefiles/wx.bkl 2009-03-22 20:09:05.000000000 +0100
@@ -96,7 +96,7 @@
$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/wx/config
- $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(LIBDIR)/wx/config
+ ${BSD_INSTALL_SCRIPT} lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(LIBDIR)/wx/config
(cd $(DESTDIR)$(BINDIR) && rm -f wx-config && $(LN_S) $(LIBDIR)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
diff -uNr wxWidgets-2.8.10.orig/utils/wxrc/wxrc.bkl wxWidgets-2.8.10/utils/wxrc/wxrc.bkl
--- wxWidgets-2.8.10.orig/utils/wxrc/wxrc.bkl 2009-03-06 13:11:15.000000000 +0100
+++ wxWidgets-2.8.10/utils/wxrc/wxrc.bkl 2009-03-22 20:10:17.000000000 +0100
@@ -21,7 +21,7 @@
rm -f $(DESTDIR)$(BINDIR)/wxrc$(EXEEXT) $(DESTDIR)$(BINDIR)/$(versioned_name)
- $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(BINDIR)
+ ${LIBTOOL} --mode=install $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(BINDIR)
mv -f $(DESTDIR)$(BINDIR)/wxrc$(EXEEXT) $(DESTDIR)$(BINDIR)/$(versioned_name)
(cd $(DESTDIR)$(BINDIR) && $(LN_S) $(versioned_name) wxrc$(EXEEXT))