Unicode compilation fix

[wxWidgets.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index fc83ce9a0a121b593a2c1a4b6718e156055d52ec..18cc33a03063c49ceefa82e8e1f6017d836c994c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -43,7 +43,7 @@ soversion := $(shell grep '^WX_CURRENT=' configure.in | sed 's/WX_CURRENT=\([0-9
 sorelease := $(release:%-$(DEBIAN_WXFLAVOUR)=%).$(soversion)$(addprefix -,$(DEBIAN_WXFLAVOUR))
 
 pydir     := usr/lib/$(python_ver)/site-packages
 sorelease := $(release:%-$(DEBIAN_WXFLAVOUR)=%).$(soversion)$(addprefix -,$(DEBIAN_WXFLAVOUR))
 
 pydir     := usr/lib/$(python_ver)/site-packages

-wxpydir   := $(pydir)/wx-$(sorelease)-gtk2-unicode
+wxpydir   := $(pydir)/wx-$(release)-gtk2-unicode

 
 cross_host  = i586-mingw32msvc
 cross_build = $(shell ./config.guess)
 
 cross_host  = i586-mingw32msvc
 cross_build = $(shell ./config.guess)


@@ -259,7 +259,6 @@ build-gtk-shared-contrib-stamp: build-gtk-shared-stamp
        dh_testdir
        cd $(objdir_gtk_shared)/contrib/src && $(FAST_MAKE)
        cd $(objdir_gtk_shared)/utils/wxrc && $(FAST_MAKE)
        dh_testdir
        cd $(objdir_gtk_shared)/contrib/src && $(FAST_MAKE)
        cd $(objdir_gtk_shared)/utils/wxrc && $(FAST_MAKE)

-       #cd $(objdir_gtk_shared)/contrib/utils/wxrcedit && $(FAST_MAKE)

        touch $@
 
 
        touch $@
 
 


@@ -538,11 +537,8 @@ install-common: install-gtk-shared-stamp
        dh_installman debian/wx-config.1
 
        dh_install $(objdir_gtk_shared)/utils/wxrc/wxrc usr/bin
        dh_installman debian/wx-config.1
 
        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
        dh_link usr/share/man/man1/wxrc-tools.1 usr/share/man/man1/wxrc.1
        dh_installman debian/wxrc-tools.1
        dh_link usr/share/man/man1/wxrc-tools.1 usr/share/man/man1/wxrc.1

-#      dh_link usr/share/man/man1/wxrc-tools.1 usr/share/man/man1/wxrcedit.1

 
 
 install-headers: DH_OPTIONS=-p$(package_headers)
 
 
 install-headers: DH_OPTIONS=-p$(package_headers)