AUTOMAKE_OPTIONS: fix ansi2knr option, include path

Set correct relative path to ansi2knr.c in AUTOMAKE_OPTIONS, so that
ansi2knr.{1|c} is only included once in the distribution archive.

diff --git a/src/ipaddr/Makefile.am b/src/ipaddr/Makefile.am
index fcbb7cfd77f5e2feaf050935f456f4bc964124cd..6ce299f2c9afc0b65edfcafd4b27cfc807b317ed 100644 (file)
--- a/src/ipaddr/Makefile.am
+++ b/src/ipaddr/Makefile.am
@@ -1,4 +1,9 @@
-AUTOMAKE_OPTIONS = ansi2knr
+#
+# ipaddr/Makefile.am
+# (c) 2008 Florian Westphal <fw@strlen.de>, public domain.
+#
+
+AUTOMAKE_OPTIONS = ../portab/ansi2knr
 
 INCLUDES = -I$(srcdir)/../portab
 

diff --git a/src/tool/Makefile.am b/src/tool/Makefile.am
index 5f1e97ad056bbebcd0bea8026961e5de500aace7..8d6cda46656b5d67a6bc8244e6fadd8544b876e9 100644 (file)
--- a/src/tool/Makefile.am
+++ b/src/tool/Makefile.am
@@ -1,6 +1,6 @@
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+# Copyright (c)2001-2012 Alexander Barton (alex@barton.de) and Contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -8,10 +8,8 @@
 # (at your option) any later version.
 # Please read the file COPYING, README and AUTHORS for more information.
 #
-# $Id: Makefile.am,v 1.1 2003/01/13 12:20:16 alex Exp $
-#
 
-AUTOMAKE_OPTIONS = ansi2knr
+AUTOMAKE_OPTIONS = ../portab/ansi2knr
 
 INCLUDES = -I$(srcdir)/../portab