Module: ngircd.git Branch: master Commit: 5c160921ff898653666e72eb2e6c33575ada9672 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=5c160...

Author: Alexander Barton alex@barton.de Date: Sun Sep 16 12:43:12 2012 +0200

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.

---

src/ipaddr/Makefile.am | 7 ++++++- src/tool/Makefile.am | 6 ++---- 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/ipaddr/Makefile.am b/src/ipaddr/Makefile.am index fcbb7cf..6ce299f 100644 --- 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 5f1e97a..8d6cda4 100644 --- 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