[Pkg-samba-maint] Bug#394830: samba: FTBFS on GNU/kFreeBSD

[Petr Salinger]

Package: samba
Severity: important
Version: 3.0.23c-3
Tags: patch


Hi,

the current version fails to build on GNU/kFreeBSD.

It needs small tweaks to debian/rules.
Please find attached patch with them.

Thanks in advance

                         Petr

-------------- next part --------------
diff -u samba-3.0.23c/debian/rules samba-3.0.23c/debian/rules
--- samba-3.0.23c/debian/rules
+++ samba-3.0.23c/debian/rules
@@ -51,18 +51,17 @@
 		--with-shared-modules=idmap_rid,idmap_ad \
 		--with-automount \
 		--with-ldap \
-		--with-cifsmount \
 		--with-python=python
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
   conf_args += \
-		--with-smbmount \
+		--with-smbmount --with-cifsmount \
 		--with-acl-support \
 		--with-quotas
   mount_cifs	= yes
   smbfs		= yes
 else
-  conf_args +=	--without-quotas
+  conf_args +=	--without-quotas --without-smbmount --without-cifsmount
   mount_cifs	= no
   smbfs		= no
 endif
@@ -108,7 +107,11 @@
 
 	dh_clean
 
-install: DH_OPTIONS=
+ifeq ($(smbfs),no)
+  DH_EXTRAS=-Nsmbfs
+endif
+
+install: DH_OPTIONS=$(DH_EXTRAS)
 install: build
 	dh_testdir
 	dh_testroot
@@ -184,9 +187,6 @@
 
 # Build architecture-dependent files here.
 # Pass -a to all debhelper commands in this target to reduce clutter.
-ifeq ($(smbfs),no)
-  DH_EXTRAS=-Nsmbfs
-endif
 
 binary-arch: DH_OPTIONS=-a $(DH_EXTRAS)
 binary-arch: build install