commit 1e5a7aac877f2b5d105d8cb291b107217b140632 from: Alexander Barton date: Tue Dec 25 18:14:31 2012 UTC 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"). commit - b5b3dd9cfd7e1a10eecc92c8b23bd65945b61a31 commit + 1e5a7aac877f2b5d105d8cb291b107217b140632 blob - cd51d7fe0de1d1c7d73231868f32068faf96b7ba blob + 2b9b3aab5318a30cc4c1c398ec205ae93d4d0e87 --- doc/Makefile.am +++ doc/Makefile.am @@ -11,7 +11,7 @@ .tmpl: $(AM_V_GEN)sed \ - -e s@:ETCDIR:@${sysconfdir}@ \ + -e "s@:ETCDIR:@${sysconfdir}@" \ <$< >$@ SUFFIXES = .tmpl blob - 5624e2a1839efa75487975261f36dbb94a7ad98f blob + 077d0eabad1b6b8edf2d7846476d803b8552775b --- man/Makefile.am +++ man/Makefile.am @@ -1,16 +1,13 @@ # # 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. +# 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. # -# $Id: Makefile.am,v 1.6 2006/12/25 16:13:26 alex Exp $ -# 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