Changeset 4aa0f6b for doc

Timestamp:

2010-06-07T14:31:07Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

56699f0

Parents:

0d9d53e (diff), 1fdb0a4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging killerbee stuff, bringing all the bleeding-edge stuff together.

Location:

doc

Files:

• Makefile (modified) (2 diffs)
• user-guide/Makefile (modified) (2 diffs)

doc/Makefile

@@ -1 +1 @@
 -include ../Makefile.settings
+ifdef SRCDIR
+SRCDIR := $(SRCDIR)doc/
+endif
 
 all:
@@ -7 +10 @@
 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 $@
 

doc/user-guide/Makefile

@@ -1 +1 @@
 -include ../../Makefile.settings
+ifdef SRCDIR
+SRCDIR := $(SRCDIR)doc/user-guide/
+endif
+
 EXTRAPARANEWLINE = 1
 # EXTRAPARANEWLINE = 0
@@ -38 +42 @@
         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: