post wxUniv merge fixes

[wxWidgets.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 6e78d36f5bc13f575d320378d3a4d0427237c85c..8ac1b812696caf1d10584aacb4731f6482cf5e52 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -43,14 +43,18 @@ objdirs=$(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_wxbase_debug) \
        $(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug) \
        $(objdir_doc) $(objdir_examples)
 
+#      note that the i18n package is actually arch indep (once built)
+#      but must be built (and installed) during the arch any phase as
+#      it's pulled out of the wxGtk shared lib package.
+
 # Build stamps:
 build_arch_stamps=build-wxbase-shared-stamp build-wxbase-static-stamp \
                   build-wxbase-debug-stamp build-gtk-shared-stamp \
                   build-gtk-static-stamp build-gtk-debug-stamp \
                   build-contrib-shared-stamp build-contrib-static-stamp \
-                  build-gtk-py-stamp
+                  build-gtk-py-stamp build-i18n-stamp
 
-build_indep_stamps=build-examples-stamp build-doc-stamp build-i18n-stamp
+build_indep_stamps=build-examples-stamp build-doc-stamp
 
 build_stamps=$(build_arch_stamps) $(build_indep_stamps)
 
@@ -58,13 +62,18 @@ build_stamps=$(build_arch_stamps) $(build_indep_stamps)
 install_all_arch=install-wxbase-lib install-wxbase-dev install-wxbase-dbg \
                  install-gtk-lib install-gtk-dev install-gtk-dbg \
                  install-gtk-contrib install-gtk-contrib-dev install-gtk-py \
-                 install-headers
+                 install-headers install-i18n
 
-install_all_indep=install-i18n install-doc install-examples
+install_all_indep=install-examples install-doc
 
 install_all=$(install_all_arch) $(install_all_indep)
 
 
+wxconfig:=$(shell pwd)/$(objdir_gtk_shared)/wx-config \
+                --prefix=$(shell pwd) \
+                --exec-prefix=$(shell pwd)/$(objdir_gtk_shared)
+
+
 # The Rules:
 
 debian/control: debian/control.in
@@ -131,8 +140,11 @@ control-files-stamp: debian/control debian/wxwin-doc.doc-base
        touch $@
 
 build_arch: control-files-stamp $(build_arch_stamps)
+build_all: control-files-stamp $(build_stamps)
+
+# do nothing until we know which binary target is called
+build:
 
-build: control-files-stamp $(build_stamps)
 
 build-wxbase-shared-stamp:
        dh_testdir
@@ -236,7 +248,7 @@ build-gtk-py-stamp: build-gtk-shared-stamp
        dh_testdir
        touch docs/lgpl.txt
        cd wxPython \
-               && ./setup.py build IN_CVS_TREE=1
+               && ./setup.py build IN_CVS_TREE=1 WX_CONFIG='$(wxconfig)'
        touch $@
 
 build-doc-stamp: build-gtk-shared-stamp
@@ -303,7 +315,7 @@ clean: debian/control
 
 install_arch: build_arch $(install_all_arch)
 
-install: build $(install_all)
+install: build_all $(install_all)
 
 install-wxbase-lib: DH_OPTIONS=-p$(package_wxbase_lib)
 install-wxbase-lib: build-wxbase-shared-stamp
@@ -430,7 +442,6 @@ install-examples: build-examples-stamp
        dh_installdirs
 
 binary-common:
-       dh_testversion 1.1.17
        dh_testdir
        dh_testroot
        dh_installdocs
@@ -440,7 +451,7 @@ binary-common:
        dh_strip -N$(package_gtk_dbg) -N$(package_wxbase_dbg)
        dh_compress
        dh_fixperms
-       dh_makeshlibs -N$(package_gtk_py)
+       dh_makeshlibs -N$(package_gtk_py) -V
        dh_installdeb
        dh_shlibdeps -ldebian/$(package_gtk_lib)/usr/lib
        dh_gencontrol
@@ -450,7 +461,7 @@ binary-common:
 # Build architecture-independent files here.
 # Note that you currently can't build the indep packages without first
 # building the arch specific package files needed to create them.
-binary-indep: build install
+binary-indep: build_all install
        $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
 
 # Build just the architecture-dependent files here.
@@ -498,7 +509,7 @@ binary-doc: control-files-stamp install-doc
        $(MAKE) -f debian/rules DH_OPTIONS=-p$(package_doc) binary-common
 
 
-.PHONY: build build_arch clean binary-indep binary-arch binary binary-common \
+.PHONY: build build_all build_arch clean binary-indep binary-arch binary binary-common \
         binary-gtk binary-gtk-dev binary-gtk-dbg binary-wxbase binary-wxbase-dev \
        binary-wxbase-dbg binary-doc install install_arch install-wxbase-lib \
         install-wxbase-dev install-wxbase-dbg install-gtk-lib install-gtk-dev \