typo fix.

disable generation of gtk-univ, we'll replace it with x11-univ later.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18534 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2003-01-03 10:22:20 +00:00
parent 29ffee2cd2
commit 3dbec2dc52
2 changed files with 12 additions and 8 deletions

18
debian/rules vendored
View File

@@ -78,10 +78,12 @@ objdirs=$(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_wxbase_debug) \
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-gtk-univ-stamp \
build-contrib-shared-stamp build-contrib-static-stamp \
build-gtk-py-stamp build-i18n-stamp
# disable gtk-univ build, we'll replace it with x11-univ later.
# build-gtk-univ-stamp
build_indep_stamps=build-examples-stamp build-doc-stamp
build_cross_stamps=build-wxbase-msw-shared-stamp build-wxbase-msw-static-stamp \
@@ -95,10 +97,12 @@ build_stamps=$(build_stamps_native) $(build_cross_stamps)
# Install targets:
install_all_arch=install-wxbase-lib install-wxbase-dev install-wxbase-dbg \
install-gtk-lib install-gtk-dev install-gtk-dbg \
install-gtk-univ \
install-gtk-contrib install-gtk-contrib-dev install-gtk-py \
install-headers install-i18n
# disable gtk-univ build, we'll replace it with x11-univ later.
# install-gtk-univ
install_all_indep=install-examples install-doc
install_all_cross=install-wxbase-msw-dev install-wxbase-msw-dbg install-msw-dev install-msw-dbg install-headers-msw
@@ -631,10 +635,10 @@ install-headers: install-gtk-lib
# them. Do that in a scratch dirs, and move the gtk ones last, so at least
# they win in the result of any uncaught conflict.
cd $(objdir_gtk_univ) \
&& $(MAKE) install prefix=`pwd`/../$(objdir_univ_install)/usr
# cd $(objdir_gtk_univ) \
# && $(MAKE) install prefix=`pwd`/../$(objdir_univ_install)/usr
dh_movefiles --sourcedir=$(objdir_univ_install)
# dh_movefiles --sourcedir=$(objdir_univ_install)
dh_movefiles --sourcedir=debian/$(package_gtk_lib)
dh_installmanpages \
@@ -759,13 +763,13 @@ binary-common:
# building the arch specific package files needed to create them.
binary-indep: build_all install
$(MAKE) -f debian/rules \
DH_OPTIONS="-i -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw)" \
DH_OPTIONS="-i -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw) -N$(package_gtk_univ)" \
binary-common
# Build just the architecture-dependent files here.
binary-arch: build_arch install_arch
$(MAKE) -f debian/rules \
DH_OPTIONS="-a -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw)" \
DH_OPTIONS="-a -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw) -N$(package_gtk_univ)" \
binary-common
# Build all packages target.