--- procps.old/debian/rules Wed Aug 13 19:50:46 2008 +++ /opt/emdebian/trunk/p/procps/trunk/procps-3.2.7/debian/rules Wed Aug 13 19:50:56 2008 @@ -12,6 +12,13 @@ DEBROOT=$(CURDIR)/debian/procps DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +DEB_HOST_GNU_TYPE=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) +CROSS=CC=$(DEB_HOST_GNU_TYPE)-gcc +else +CROSS= +endif CFLAGS=-g @@ -21,10 +28,10 @@ dh_testdir [ -d static ] || mkdir static - $(MAKE) lib64=lib SHARED=0 CFLAGS="$(CFLAGS)" proc/libproc.a + $(MAKE) $(CROSS) lib64=lib SHARED=0 CFLAGS="$(CFLAGS)" proc/libproc.a mv proc/libproc.a static $(MAKE) clean - $(MAKE) W_SHOWFROM=\-DW_SHOWFROM lib64=lib CFLAGS="$(CFLAGS)" + $(MAKE) $(CROSS) W_SHOWFROM=\-DW_SHOWFROM lib64=lib CFLAGS="$(CFLAGS)" touch build-stamp @@ -46,14 +53,12 @@ dh_installdirs # Add here commands to install the package into debian/procps. - $(MAKE) lib64=lib ln_f="ln -sf" ldconfig=echo DESTDIR=$(DEBROOT) install + $(MAKE) $(CROSS) lib64=lib ln_f="ln -sf" ldconfig=echo DESTDIR=$(DEBROOT) install install --mode 644 -o root -g root debian/sysctl.conf $(DEBROOT)/etc/ - cp debian/lintian $(DEBROOT)/usr/share/lintian/overrides/procps cp debian/bug-presubj $(DEBROOT)/usr/share/bug/procps/presubj # Rename w as there are two of them (cd $(DEBROOT)/usr/bin && mv w w.procps ) - (cd $(DEBROOT)/usr/share/man/man1 && mv w.1 w.procps.1 ) # Work-around until proc includes fixed (cp proc/*.h $(CURDIR)/debian/libproc-dev/usr/include/proc) @@ -79,9 +84,7 @@ binary-arch: build install dh_testdir dh_testroot - dh_installchangelogs NEWS - dh_installdocs - dh_installexamples + $(RM) -r debian/procps/usr/share/man/ dh_install dh_installmenu # dh_installdebconf @@ -92,9 +95,7 @@ # dh_installmime dh_installinit --update-rcd-params='start 30 S .' # dh_installcron - dh_installinfo # dh_undocumented - dh_installman dh_link dh_strip dh_compress