added wxVaCopy() and use it to fix wxVsnprintf() crash (see bug 1017651)

[wxWidgets.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 2bd5c49bad3cd7ae1f9c8016f1aec5db096c6e94..f5acc68e8641c6fc0a8f2f4b9fcef8f9fb58694d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -281,7 +281,7 @@ build-gtk-debug-stamp: configure-gtk-debug-stamp
 build-gtk-shared-contrib-stamp: build-gtk-shared-stamp
        dh_testdir
        cd $(objdir_gtk_shared)/contrib/src && $(FAST_MAKE)
-       cd $(objdir_gtk_shared)/contrib/utils/wxrc && $(FAST_MAKE)
+       cd $(objdir_gtk_shared)/utils/wxrc && $(FAST_MAKE)
        #cd $(objdir_gtk_shared)/contrib/utils/wxrcedit && $(FAST_MAKE)
        touch $@
 
@@ -327,8 +327,7 @@ build-doc-stamp: build-gtk-shared-stamp
                   -twice -html
        cp docs/latex/wx/*.gif $(objdir_doc)
        rm -rf $(objdir_doc_cruft)
-       rm -f $(objdir_doc)/wxwin.con $(objdir_doc)/wxwin.hh* \
-             $(objdir_doc)/wxwin.htx $(objdir_doc)/wxwin.ref
+       rm -f $(objdir_doc)/wx$(release)-manual.{con,hh*,htx,ref}
        touch $@
 
 build-examples-stamp: build-gtk-shared-stamp
@@ -554,7 +553,7 @@ install-common: install-gtk-shared-stamp
        dh_install $(objdir_gtk_install)/share/aclocal  usr/share
        dh_installman debian/wx-config.1
 
-       dh_install $(objdir_gtk_shared)/contrib/utils/wxrc/wxrc         usr/bin
+       dh_install $(objdir_gtk_shared)/utils/wxrc/wxrc usr/bin
 #      dh_install $(objdir_gtk_shared)/contrib/utils/wxrcedit/wxrcedit usr/bin
 
        dh_installman debian/wxrc-tools.1