Fixed build outside the source directory (Ansgar Burchardt)

diff --git a/ChangeLog b/ChangeLog
index 96ef9fe37ef411d55c17ac137667b08790cc6c10..f4a0d2b44b6e020c84fc51b51732701f70b5e75d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 --git a/Makefile.am b/Makefile.am
index 17fc4c703e4a1d49058e42c954d8eafbd498fa6a..54c08daf2ab4ae49e717765d9657726f1431f61b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 @@ man1_MANS = man/mlmmj-bounce.1 man/mlmmj-make-ml.sh.1 man/mlmmj-recieve.1 \
            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 --git a/configure.ac b/configure.ac
index 72febd3f6a804d00f6ea7a546069750a3c9c5a3a..8449b099c9cc69c11e78ebcbbbd00ebf0fb74931 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -42,5 +42,6 @@ AC_CONFIG_FILES([Makefile])
 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 --git a/contrib/Makefile.am b/contrib/Makefile.am
new file mode 100644 (file)
index 0000000..dc4c348
--- /dev/null
+++ b/contrib/Makefile.am
@@ -0,0 +1,4 @@
+## Process this file with automake to produce Makefile.in
+
+EXTRA_DIST = web
+SUBDIRS = recievestrip

diff --git a/contrib/recievestrip/Makefile.am b/contrib/recievestrip/Makefile.am
index 2088942bb94f5ab657c57e25e6a2d0315e633123..94bb9e41e992ba66f405618c576ec214c25945a5 100644 (file)
--- a/contrib/recievestrip/Makefile.am
+++ b/contrib/recievestrip/Makefile.am
@@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = foreign
 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 --git a/include/mlmmj.h b/include/mlmmj.h
index ed2e35dfff44dc01eed392932d1fc26181fe6e9d..7373d5a888abdc368ce93caa5e2c3592814b4551 100644 (file)
--- a/include/mlmmj.h
+++ b/include/mlmmj.h
@@ -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 --git a/src/log_error.c b/src/log_error.c
index 96a745a39129981982ffb2524ce02a9198417c73..00a9fdc5e9f289b1848b7e624dffc97d3cbf8f5b 100644 (file)
--- a/src/log_error.c
+++ b/src/log_error.c
@@ -29,7 +29,7 @@
 #include <unistd.h>
 
 #include "log_error.h"
-#include "../config.h"
+#include "config.h"
 #include "memory.h"
 
 #ifdef HAVE_SYSLOG_H