Allow citadel / libcitadel to be built outside their source directory, e.g.:

mkdir build/citadel; cd build/citadel; ../../src/citadel/configure; make

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index cb952e569a6a3f91a7fc104db1c11d6b99ee041c..69b598117d3eaf2dc870ad1d33712cc030461058 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -107,7 +107,7 @@ mkdir-init:
        mkdir -p utils utillib textclient
 
 svn_revision.c: ${SOURCES}
-       ./scripts/mk_svn_revision.sh
+       $(srcdir)/scripts/mk_svn_revision.sh
 
 DEP_FILES=$(SOURCES:.c=.d) modules_init.d modules_upgrade.d
 

diff --git a/citadel/scripts/mk_svn_revision.sh b/citadel/scripts/mk_svn_revision.sh
index 46de27e2f3cc6ba1716c07b1e7079db9f836bc60..b94a7b8cef6afd520c84acfff17848318c66fbdc 100755 (executable)
--- a/citadel/scripts/mk_svn_revision.sh
+++ b/citadel/scripts/mk_svn_revision.sh
@@ -6,13 +6,15 @@
 ECHO=/usr/bin/printf
 
 
+SCRIPT_DIR=`dirname $0`
+SRC_DIR=`dirname $SCRIPT_DIR`
 CUR_DIR=`pwd`
 C_FILE="$CUR_DIR/svn_revision.c"
 H_FILE="$CUR_DIR/svn_revision.h"
 
 
 # determine if this code base came from subversion.
-if test -d .svn  ; then
+if test -d $SRC_DIR/.svn  ; then
        echo "have subversion repository"
        SVNVERSION=`which svnversion`
        if test -x $SVNVERSION  ; then

diff --git a/libcitadel/lib/stringbuf.c b/libcitadel/lib/stringbuf.c
index c882189c9a60b2ea0f17684723f2cddf6efb6644..6f2904456370fa9e3199fcac60add5ec9a34edac 100644 (file)
--- a/libcitadel/lib/stringbuf.c
+++ b/libcitadel/lib/stringbuf.c
@@ -1,4 +1,4 @@
-#include "../sysdep.h"
+#include "sysdep.h"
 #include <ctype.h>
 #include <errno.h>
 #include <string.h>