[packages] miredo: Fix compiling with automake v1.11.3 (#11283)

git-svn-id: svn://svn.openwrt.org/openwrt/packages@31324 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/ipv6/miredo/Makefile b/ipv6/miredo/Makefile
index 5de77f5..ea23056 100644 (file)
--- a/ipv6/miredo/Makefile
+++ b/ipv6/miredo/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2011 OpenWrt.org
+# Copyright (C) 2006-2012 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:=miredo
 PKG_VERSION:=1.2.4
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE_URL:=http://www.remlab.net/files/miredo
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

diff --git a/ipv6/miredo/patches/120-automake-compat.patch b/ipv6/miredo/patches/120-automake-compat.patch
new file mode 100644 (file)
index 0000000..608bba5
--- /dev/null
+++ b/ipv6/miredo/patches/120-automake-compat.patch
@@ -0,0 +1,23 @@
+Index: miredo-1.2.4/src/Makefile.am
+===================================================================
+--- miredo-1.2.4.orig/src/Makefile.am  2012-04-17 01:15:14.000000000 +0300
++++ miredo-1.2.4/src/Makefile.am       2012-04-17 01:17:45.000000000 +0300
+@@ -32,7 +32,8 @@
+       -DPKGLIBDIR=\"$(pkglibdir)\"
+ 
+ sbin_PROGRAMS = miredo miredo-server miredo-checkconf
+-pkglib_PROGRAMS =
++programfilesdir = $(pkglibdir)
++programfiles_PROGRAMS =
+ EXTRA_PROGRAMS = privproc
+ noinst_LTLIBRARIES = libmiredo.la
+ TESTS =
+@@ -59,7 +60,7 @@
+ miredo_privproc_SOURCES = privproc.c privproc.h
+ miredo_privproc_LDADD = ../libteredo/libteredo.la $(LIBCAP)
+ if TEREDO_CLIENT
+-pkglib_PROGRAMS += miredo-privproc
++programfiles_PROGRAMS += miredo-privproc
+ TESTS += miredo-checkconf
+ endif
+