# HG changeset patch
# User mortenp
# Date 1181672938 -36000
# Node ID 5eef399f6c4aac3564ecee26e63803ef7a64cc26
# Parent  4d0c6681916a1143a4f4e514c5585a38954b9f9f
Fixed build outside the source directory (Ansgar Burchardt)

diff -r 4d0c6681916a -r 5eef399f6c4a ChangeLog
--- a/ChangeLog	Wed Jun 13 03:01:17 2007 +1000
+++ b/ChangeLog	Wed Jun 13 04:28:58 2007 +1000
@@ -1,3 +1,4 @@
+ o Fixed build outside the source directory (Ansgar Burchardt)
  o Moved English listtexts and install all languages (Ansgar Burchardt)
  o Added encoding headers for German listtexts (Ansgar Burchardt)
  o Fixed missing exit()s in case of failed execl() calls (Ansgar Burchardt)
diff -r 4d0c6681916a -r 5eef399f6c4a Makefile.am
--- a/Makefile.am	Wed Jun 13 03:01:17 2007 +1000
+++ b/Makefile.am	Wed Jun 13 04:28:58 2007 +1000
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = foreign dist-bzip2
 EXTRA_DIST = include VERSION LICENSE UPGRADE src/log_error.c FAQ \
-	     TUNABLES README.access contrib man \
+	     TUNABLES README.access man \
 	     README.exim4 README.sendmail README.security README.qmail
 CLEANFILES = *~ mlmmj-*.tar.*
 
@@ -13,4 +13,4 @@
 	    man/mlmmj-sub.1 man/mlmmj-maintd.1 man/mlmmj-process.1 \
 	    man/mlmmj-send.1 man/mlmmj-unsub.1 man/mlmmj-list.1
 
-SUBDIRS = src listtexts
+SUBDIRS = src listtexts contrib
diff -r 4d0c6681916a -r 5eef399f6c4a configure.ac
--- a/configure.ac	Wed Jun 13 03:01:17 2007 +1000
+++ b/configure.ac	Wed Jun 13 04:28:58 2007 +1000
@@ -42,5 +42,6 @@
 AC_CONFIG_FILES([src/Makefile])
 AC_CONFIG_FILES([src/mlmmj-make-ml.sh])
 AC_CONFIG_FILES([listtexts/Makefile])
+AC_CONFIG_FILES([contrib/Makefile])
 AC_CONFIG_FILES([contrib/recievestrip/Makefile])
 AC_OUTPUT
diff -r 4d0c6681916a -r 5eef399f6c4a contrib/Makefile.am
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contrib/Makefile.am	Wed Jun 13 04:28:58 2007 +1000
@@ -0,0 +1,4 @@
+## Process this file with automake to produce Makefile.in
+
+EXTRA_DIST = web
+SUBDIRS = recievestrip
diff -r 4d0c6681916a -r 5eef399f6c4a contrib/recievestrip/Makefile.am
--- a/contrib/recievestrip/Makefile.am	Wed Jun 13 03:01:17 2007 +1000
+++ b/contrib/recievestrip/Makefile.am	Wed Jun 13 04:28:58 2007 +1000
@@ -5,7 +5,7 @@
 AM_CFLAGS = -g -Wall -pedantic -Wsign-compare -DDEFAULTTEXTDIR='"@textlibdir@"'
 INCLUDES = -I$(srcdir)/../../include
 
-bin_PROGRAMS = mlmmj-recieve-strip
+noinst_PROGRAMS = mlmmj-recieve-strip
 
 mlmmj_recieve_strip_SOURCES = mlmmj-recieve-strip.c ../../src/mygetline.c ../../src/memory.c ../../src/readn.c  \
 				../../src/strgen.c ../../src/random-int.c  ../../src/log_error.c ../../src/print-version.c \
diff -r 4d0c6681916a -r 5eef399f6c4a include/mlmmj.h
--- a/include/mlmmj.h	Wed Jun 13 03:01:17 2007 +1000
+++ b/include/mlmmj.h	Wed Jun 13 04:28:58 2007 +1000
@@ -24,7 +24,7 @@
 #ifndef MLMMJ_GENERIC_INCLUDES
 #define MLMMJ_GENERIC_INCLUDES
 
-#include "../config.h"
+#include "config.h"
 
 #define RELAYHOST "127.0.0.1"
 #define READ_BUFSIZE 2048
diff -r 4d0c6681916a -r 5eef399f6c4a src/log_error.c
--- a/src/log_error.c	Wed Jun 13 03:01:17 2007 +1000
+++ b/src/log_error.c	Wed Jun 13 04:28:58 2007 +1000
@@ -29,7 +29,7 @@
 #include <unistd.h>
 
 #include "log_error.h"
-#include "../config.h"
+#include "config.h"
 #include "memory.h"
 
 #ifdef HAVE_SYSLOG_H