--- shadow.old/debian/rules Tue Jul 29 17:56:35 2008 +++ /opt/emdebian/trunk/s/shadow/trunk/shadow-4.1.1/debian/rules Tue Jul 29 17:57:38 2008 @@ -8,7 +8,7 @@ override DEB_ARCH_PACKAGES=passwd endif -include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/emdebian-tools/emdebhelper.mk # Specify where dh_install will find the files that it needs to move: DEB_DH_INSTALL_SOURCEDIR=debian/tmp # Specify the destination of shadow's "make install" @@ -23,9 +23,11 @@ DEB_AUTO_UPDATE_AUTOMAKE = 1.9 # Adds extra options when calling the configure script: -DEB_CONFIGURE_EXTRA_FLAGS := --disable-shared --without-libcrack --without-audit --mandir=/usr/share/man --with-libpam --enable-shadowgrp --enable-man ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) - DEB_CONFIGURE_EXTRA_FLAGS += --host=$(DEB_HOST_GNU_TYPE) +DEB_CONFIGURE_SCRIPT_ENV= +DEB_CONFIGURE_EXTRA_FLAGS := --disable-shared --without-libcrack --without-audit --with-libpam --enable-shadowgrp --disable-man --cache-file=$(DEB_HOST_GNU_TYPE).cache +else +DEB_CONFIGURE_EXTRA_FLAGS := --disable-shared --without-libcrack --without-audit --mandir=/usr/share/man --with-libpam --enable-shadowgrp --enable-man endif # Automatically controls patching at build time: @@ -39,21 +41,17 @@ endif export CFLAGS +clean:: + rm -f man/po/*.gmo + # Add extras to the install process: binary-install/login:: dh_installpam -p login dh_installpam -p login --name=su install -c -m 444 debian/login.defs debian/login/etc/login.defs install -c -m 444 debian/securetty.$(DEB_HOST_ARCH_OS) debian/login/etc/securetty - # Lintian and Linda overrides - install -c -m 444 debian/login.lintian-overrides debian/login/usr/share/lintian/overrides/login - install -c -m 444 debian/login.linda-overrides debian/login/usr/share/linda/overrides/login binary-install/passwd:: - install -c -m 444 man/shadowconfig.8 debian/passwd/usr/share/man/man8 - install -c -m 444 man/ja/shadowconfig.8 debian/passwd/usr/share/man/ja/man8 - install -c -m 444 man/pl/shadowconfig.8 debian/passwd/usr/share/man/pl/man8 - install -c -m 444 man/fr/shadowconfig.8 debian/passwd/usr/share/man/fr/man8 # Distribute the pam.d files; unless for the commands with disabled PAM # support (see patch 404_undef_USE_PAM.dpatch) dh_installpam -p passwd --name=passwd @@ -67,12 +65,6 @@ install -c -m 644 debian/useradd.default debian/passwd/etc/default/useradd install -d debian/passwd/sbin install -c -m 555 debian/shadowconfig.sh debian/passwd/sbin/shadowconfig - install -c -m 444 debian/cpgr.8 debian/passwd/usr/share/man/man8 - install -c -m 444 debian/cppw.8 debian/passwd/usr/share/man/man8 - # Lintian overrides files - install -c -m 444 debian/passwd.lintian-overrides debian/passwd/usr/share/lintian/overrides/passwd - # Linda overrides files - install -c -m 444 debian/passwd.linda-overrides debian/passwd/usr/share/linda/overrides/passwd binary-predeb/login:: # No real need for login to be setuid root