From fd90d0f7a8794c432302fe73b6f8f822134bf645 Mon Sep 17 00:00:00 2001 From: jow Date: Mon, 2 Apr 2012 20:50:04 +0000 Subject: [PATCH] [packages] avahi: fix autoreconf with automake v1.11.3 git-svn-id: svn://svn.openwrt.org/openwrt/packages@31181 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- libs/avahi/Makefile | 4 ++-- libs/avahi/patches/020-automake-compat.patch | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 libs/avahi/patches/020-automake-compat.patch diff --git a/libs/avahi/Makefile b/libs/avahi/Makefile index bf00e773e..9adf41548 100644 --- a/libs/avahi/Makefile +++ b/libs/avahi/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2011 OpenWrt.org +# Copyright (C) 2007-2012 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -16,7 +16,7 @@ endif PKG_NAME:=avahi PKG_VERSION:=0.6.30 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/libs/avahi/patches/020-automake-compat.patch b/libs/avahi/patches/020-automake-compat.patch new file mode 100644 index 000000000..042c9c8bb --- /dev/null +++ b/libs/avahi/patches/020-automake-compat.patch @@ -0,0 +1,26 @@ +--- a/service-type-database/Makefile.am ++++ b/service-type-database/Makefile.am +@@ -18,13 +18,12 @@ + EXTRA_DIST=build-db.in service-types + + pkgdata_DATA=service-types +-pkglib_DATA= + + if HAVE_PYTHON + if HAVE_GDBM + + noinst_SCRIPTS=build-db +-pkglib_DATA+=service-types.db ++pkgdata_DATA+=service-types.db + + build-db: build-db.in + $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \ +@@ -41,7 +40,7 @@ endif + if HAVE_DBM + + noinst_SCRIPTS=build-db +-pkglib_DATA+=service-types.db.pag service-types.db.dir ++pkgdata_DATA+=service-types.db.pag service-types.db.dir + + build-db: build-db.in + $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \ -- 2.11.0