Changeset b308cf9 for doc/Makefile

Timestamp:

2010-06-05T23:21:02Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

1fdb0a4

Parents:

3ab1d31 (diff), e774815 (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 libpurple branch into killerbee. It's fairly usable already, and
Debian packaging is now properly separated. This also picks up a load of
stuff from mainline it seems.

File:

• doc/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 $@