From: Michael Hampton <io_error@uncensored.citadel.org>
Date: Sat, 19 Dec 2009 00:02:37 +0000 (+0000)
Subject: Allow citadel / libcitadel to be built outside their source directory, e.g.:
X-Git-Tag: v7.86~562
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=a844f4815c71920114f6d2171341174eb192d45a

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 cb952e569..69b598117 100644
--- 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 46de27e2f..b94a7b8ce 100755
--- 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 c882189c9..6f2904456 100644
--- 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>