Module: ngircd.git Branch: master Commit: 1e5a7aac877f2b5d105d8cb291b107217b140632 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1e5a7aac8... Author: Alexander Barton <alex@barton.de> Date: Tue Dec 25 19:13:55 2012 +0100 Makefiles: Correctly quote sed expressions Now the Makefiles support spaces in "$sysconfdir", which isn't uncommon for Cygwin for example, when $HOME contains whitespaces ("/home/User Name") and ngIRCd is installed into the user home ("./configure --prefix=$HOME"). --- doc/Makefile.am | 2 +- man/Makefile.am | 21 +++++++++------------ 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index cd51d7f..2b9b3aa 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -11,7 +11,7 @@ .tmpl: $(AM_V_GEN)sed \ - -e s@:ETCDIR:@${sysconfdir}@ \ + -e "s@:ETCDIR:@${sysconfdir}@" \ <$< >$@ SUFFIXES = .tmpl diff --git a/man/Makefile.am b/man/Makefile.am index 5624e2a..077d0ea 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,15 +1,12 @@ # # 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 # -# Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen -# der GNU General Public License (GPL), wie von der Free Software Foundation -# herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2 -# der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version. -# Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste -# der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. -# -# $Id: Makefile.am,v 1.6 2006/12/25 16:13:26 alex Exp $ +# 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 +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# Please read the file COPYING, README and AUTHORS for more information. # TEMPLATE_MANS = ngircd.conf.5.tmpl ngircd.8.tmpl @@ -18,9 +15,9 @@ SUFFIXES = .tmpl . .tmpl: $(AM_V_GEN)sed \ - -e s@:SBINDIR:@${sbindir}@ \ - -e s@:BINDIR:@${bindir}@ \ - -e s@:ETCDIR:@${sysconfdir}@ \ + -e "s@:SBINDIR:@${sbindir}@" \ + -e "s@:BINDIR:@${bindir}@" \ + -e "s@:ETCDIR:@${sysconfdir}@" \ <$< >$@ man_MANS = ngircd.conf.5 ngircd.8