From f60079b74053a53da3720b992c603fddf75ff1dd Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Tue, 25 May 2010 23:26:54 +0100
Subject: Allow one to run the configure script from a different directory and
 put all build files in there. I need this to properly make Debian package
 variants (i.e. libpurple and native).

---
 doc/Makefile            | 3 +++
 doc/user-guide/Makefile | 4 ++++
 2 files changed, 7 insertions(+)

(limited to 'doc')

diff --git a/doc/Makefile b/doc/Makefile
index 9b473df3..aeebd901 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,4 +1,7 @@
 -include ../Makefile.settings
+ifdef SRCDIR
+SRCDIR := $(SRCDIR)doc/
+endif
 
 all:
 	# Only build the docs if this is a bzr checkout
diff --git a/doc/user-guide/Makefile b/doc/user-guide/Makefile
index 9841de8d..eaf2a5ff 100644
--- a/doc/user-guide/Makefile
+++ b/doc/user-guide/Makefile
@@ -1,4 +1,8 @@
 -include ../../Makefile.settings
+ifdef SRCDIR
+SRCDIR := $(SRCDIR)doc/user-guide/
+endif
+
 EXTRAPARANEWLINE = 1
 # EXTRAPARANEWLINE = 0
 
-- 
cgit v1.2.3


From 4af305032ba6913449cbd9160db1b6ab228f0a9a Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Tue, 25 May 2010 23:41:52 +0100
Subject: install-* targets should also work now. Let's see how this works out
 in a deb.

---
 doc/Makefile            | 4 ++--
 doc/user-guide/Makefile | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/Makefile b/doc/Makefile
index aeebd901..5f59879e 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -9,8 +9,8 @@ all:
 
 install:
 	mkdir -p $(DESTDIR)$(MANDIR)/man8/ $(DESTDIR)$(MANDIR)/man5/
-	install -m 0644 bitlbee.8 $(DESTDIR)$(MANDIR)/man8/
-	install -m 0644 bitlbee.conf.5 $(DESTDIR)$(MANDIR)/man5/
+	install -m 0644 $(SRCDIR)bitlbee.8 $(DESTDIR)$(MANDIR)/man8/
+	install -m 0644 $(SRCDIR)bitlbee.conf.5 $(DESTDIR)$(MANDIR)/man5/
 	$(MAKE) -C user-guide $@
 
 uninstall:
diff --git a/doc/user-guide/Makefile b/doc/user-guide/Makefile
index eaf2a5ff..2a80ea6c 100644
--- a/doc/user-guide/Makefile
+++ b/doc/user-guide/Makefile
@@ -41,7 +41,7 @@ install:
 	mkdir -p $(DESTDIR)$(DATADIR)
 	chmod 0755 $(DESTDIR)$(DATADIR)
 	rm -f $(DESTDIR)$(DATADIR)/help.txt # Prevent help function from breaking in running sessions
-	install -m 0644 help.txt $(DESTDIR)$(DATADIR)/help.txt
+	install -m 0644 $(SRCDIR)help.txt $(DESTDIR)$(DATADIR)/help.txt
 
 uninstall:
 	rm -f $(DESTDIR)$(DATADIR)/help.txt
-- 
cgit v1.2.3