From: Jo-Philipp Wich Date: Thu, 17 Jan 2013 15:27:03 +0000 (+0000) Subject: AA: netatalk: merge r35198 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fbe2902a9ceda43b9a6490d2a30e012a1d323fb7;p=openwrt%2Fsvn-archive%2Farchive.git AA: netatalk: merge r35198 SVN-Revision: 35199 --- diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile index 60c106be66..e70ad02c87 100644 --- a/net/netatalk/Makefile +++ b/net/netatalk/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2009-2012 OpenWrt.org +# Copyright (C) 2009-2013 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=netatalk PKG_VERSION:=2.2.1 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/netatalk @@ -41,7 +41,7 @@ define Package/netatalk/conffiles /etc/netatalk/afpd.conf endef -TARGET_CFLAGS += -std=gnu99 -Wl,-rpath-link=$(STAGING_DIR)/usr/lib +TARGET_CFLAGS += -std=gnu99 TARGET_LDFLAGS += $(LIBRPC) CONFIGURE_ARGS += \ @@ -61,7 +61,7 @@ CONFIGURE_ARGS += \ --disable-admin-group \ --disable-srvloc \ --disable-zeroconf \ - --without-shadow \ + $(if $(CONFIG_SHADOW_PASSWORDS),--with-shadow,--without-shadow) \ --without-ldap define Package/netatalk/install