[Pkg-ocaml-maint-commits] [SCM] ocamlnet packaging branch, experimental/master, updated. debian/2.2.9-8-43-gf80edf8

Stephane Glondu steph at glondu.net
Thu Jul 21 09:27:09 UTC 2011


The following commit has been merged in the experimental/master branch:
commit c36da4a130c3bd8a14cd0459fd56f0584ae509ec
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Jul 21 10:36:19 2011 +0200

    Fix debian/rules logic to explude rpc-auth-local

diff --git a/debian/rules b/debian/rules
index 65da3bb..564dbeb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,8 +22,11 @@ DEB_STRIP_EXCLUDE += usr/bin/netplex-admin
 DEB_STRIP_EXCLUDE += usr/bin/ocamlrpcgen
 
 # For Debian GNU/kFreeBSD and GNU/Hurd ports
-NO_RPC_AUTH_LOCAL  = $(findstring freebsd,$(DEB_HOST_ARCH))
-NO_RPC_AUTH_LOCAL += $(findstring hurd,$(DEB_HOST_ARCH))
+ifneq ($(findstring freebsd,$(DEB_HOST_ARCH)),)
+RPC_AUTH_LOCAL = no
+else ifneq ($(findstring hurd,$(DEB_HOST_ARCH)),)
+RPC_AUTH_LOCAL = no
+endif
 
 CFGFLAGS =
 CFGFLAGS += -enable-gtk2 -enable-ssl
@@ -34,7 +37,7 @@ CFGFLAGS += -enable-apache -apache /usr/sbin/apache2 -apxs /usr/bin/apxs2
 configure/$(PKGNAME):: debian/configure-stamp
 debian/configure-stamp:
 	./configure $(CFGFLAGS)
-ifneq "" "$(NO_RPC_AUTH_LOCAL)"
+ifeq ($(RPC_AUTH_LOCAL),no)
 	sed -i -n '/rpc.auth.local/!p' debian/*.install
 endif
 	touch debian/configure-stamp

-- 
ocamlnet packaging



More information about the Pkg-ocaml-maint-commits mailing list