--- orbit2.old/debian/rules	Mon Sep  1 21:07:33 2008
+++ /opt/emdebian/trunk/o/orbit2/trunk/orbit2-2.14.13/debian/rules	Mon Sep  1 21:07:33 2008
@@ -6,24 +6,27 @@
 DEB_PATCHDIRS = debian/patches debian/patches/$(DEB_HOST_ARCH)
 endif
 
-include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/emdebian-tools/emdebhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_DH_MAKESHLIBS_ARGS_liborbit2 := -V 'liborbit2 $(shlibver)'
+DEB_CONFIGURE_SCRIPT_ENV=
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-purify --disable-gtk-doc --cache-file=$(DEB_HOST_GNU_TYPE).cache
+DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) $(MAKE) IDL_COMPILER=/usr/bin/orbit-idl-2 \
+ LDFLAGS="-L/usr/$(DEB_HOST_GNU_TYPE)/lib" -C $(DEB_BUILDDIR)
 
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-purify --enable-gtk-doc --with-html-dir=/usr/share/doc/liborbit2-dev
+build/liborbit2-dev::
+	mkdir -p debian/tmp/etc/dpkg-cross/cross-config.d/$(DEB_HOST_ARCH)/
+	grep CORBA Makefile | sed -e 's/ORBIT_ALIGNOF_CORBA\(.*\)/\1/' \
+ | tr '[A-Z]' '[a-z]' | sed -e 's/^\(.*\) = \(.*\)/ac_cv_alignof_CORBA\1=\2/' \
+ > debian/tmp/etc/dpkg-cross/cross-config.d/$(DEB_HOST_ARCH)/orbit
 
 #
 # Man page generation (from Docbook source)
 #
 
-DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
-
-common-build-arch::
-	xsltproc --nonet --novalid -o debian/name-client-2.1       $(DB2MAN) debian/name-client-2.dbk
-	xsltproc --nonet --novalid -o debian/orbit-name-server-2.1 $(DB2MAN) debian/orbit-name-server-2.dbk
 
 clean::
 	echo $(DEB_PATCHDIRS)