From b7e452c713b352f9c128f320bdccbf0151c0c2a9 Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Sun, 18 May 2008 17:07:23 +0100 Subject: [PATCH] Build fixes Organization: Straylight/Edgeware From: Richard Kettlewell --- doc/Makefile.am | 4 ++-- server/actions.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 441ff52..c2971bb 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -53,11 +53,11 @@ disorder_templates.5: disorder_templates.5.head disorder_templates.5.tail \ $(top_srcdir)/server/macros-disorder.c \ $(top_srcdir)/scripts/macro-docs rm -f disorder_templates.5.new - cat disorder_templates.5.head >> disorder_templates.5.new + cat ${srcdir}/disorder_templates.5.head >> disorder_templates.5.new $(top_srcdir)/scripts/macro-docs >> disorder_templates.5.new \ $(top_srcdir)/lib/macros-builtin.c \ $(top_srcdir)/server/macros-disorder.c - cat disorder_templates.5.tail >> disorder_templates.5.new + cat ${srcdir}/disorder_templates.5.tail >> disorder_templates.5.new mv disorder_templates.5.new disorder_templates.5 EXTRA_DIST=disorderd.8.in disorder.1.in disorder_config.5.in \ diff --git a/server/actions.c b/server/actions.c index 90c5a1f..7689211 100644 --- a/server/actions.c +++ b/server/actions.c @@ -235,10 +235,10 @@ static void act_volume(void) { } /** @brief Expand the login template with @b @@error set to @p error - * @param error Error keyword + * @param e Error keyword */ -static void login_error(const char *error) { - dcgi_error_string = error; +static void login_error(const char *e) { + dcgi_error_string = e; dcgi_expand("login", 1); } -- [mdw]