[Pkg-shadow-commits] sid/debian changelog,1.33,1.34 rules,1.7,1.8
Martin Quinson
pkg-shadow-devel@lists.alioth.debian.org
Sun, 08 May 2005 22:59:48 +0000
Update of /cvsroot/pkg-shadow/sid/debian
In directory haydn:/tmp/cvs-serv30910
Modified Files:
changelog rules
Log Message:
Add --host to config_options on cross build. Patch from NIIBE Yutaka. Closes: #283729
Index: changelog
===================================================================
RCS file: /cvsroot/pkg-shadow/sid/debian/changelog,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- changelog 8 May 2005 19:40:12 -0000 1.33
+++ changelog 8 May 2005 22:59:45 -0000 1.34
@@ -1,6 +1,8 @@
shadow (1:4.0.3-34) UNRELEASED; urgency=low
* Debian packaging fixes:
+ - Add --host to config_options on cross build. Patch from NIIBE Yutaka.
+ Closes: #283729
* Debian specific programs fixes:
* Upstream bugs not fixed in upstream releases or CVS:
- 406_good_name:
Index: rules
===================================================================
RCS file: /cvsroot/pkg-shadow/sid/debian/rules,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- rules 8 May 2005 18:54:46 -0000 1.7
+++ rules 8 May 2005 22:59:45 -0000 1.8
@@ -1,9 +1,13 @@
#!/usr/bin/make -f
config_options := --disable-shared --without-libcrack --mandir=/usr/share/man
-# --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
DEB_HOST_GNU_SYSTEM := $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
+DEB_BUILD_GNU_TYPE = $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_TYPE = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+ config_options += --host=$(DEB_HOST_GNU_TYPE)
+endif
ifneq ($(DEB_HOST_GNU_SYSTEM),gnu)
config_options += --with-libpam