Build fixes

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 441ff526c51027a417e0a5dc9c99dc47c1820d1d..c2971bbea3f251e32234af3c8c135aafa899fec4 100644 (file)
--- 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
                $(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 
        $(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 \
        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 90c5a1f459d34d81534360256f9d100051847567..76892115747482b109a399ad54d3adda4ce7cb01 100644 (file)
--- 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
 }
 
 /** @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);
 }
 
   dcgi_expand("login", 1);
 }