diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2012-02-11 12:55:45 +0000 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2012-02-11 12:55:45 +0000 |
| commit | 7fa5c192c40cedb4111f0cfd3aaad9126861588b (patch) | |
| tree | b98d2679c933f562a0d30c05464cb2de19a3b560 /doc | |
| parent | 23445b601770e612be584294ad066ad45952542f (diff) | |
Rename SRCDIR directory to _SRCDIR_. I guess #907 was caused by SRCDIR
unexpectedly being set to something already.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile | 8 | ||||
| -rw-r--r-- | doc/user-guide/Makefile | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/doc/Makefile b/doc/Makefile index 5f59879e..f8655d74 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,6 +1,6 @@ -include ../Makefile.settings -ifdef SRCDIR -SRCDIR := $(SRCDIR)doc/ +ifdef _SRCDIR_ +_SRCDIR_ := $(_SRCDIR_)doc/ endif all: @@ -9,8 +9,8 @@ all: install: mkdir -p $(DESTDIR)$(MANDIR)/man8/ $(DESTDIR)$(MANDIR)/man5/ - install -m 0644 $(SRCDIR)bitlbee.8 $(DESTDIR)$(MANDIR)/man8/ - install -m 0644 $(SRCDIR)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 2a80ea6c..44ff6f51 100644 --- a/doc/user-guide/Makefile +++ b/doc/user-guide/Makefile @@ -1,6 +1,6 @@ -include ../../Makefile.settings -ifdef SRCDIR -SRCDIR := $(SRCDIR)doc/user-guide/ +ifdef _SRCDIR_ +_SRCDIR_ := $(_SRCDIR_)doc/user-guide/ endif EXTRAPARANEWLINE = 1 @@ -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 $(SRCDIR)help.txt $(DESTDIR)$(DATADIR)/help.txt + install -m 0644 $(_SRCDIR_)help.txt $(DESTDIR)$(DATADIR)/help.txt uninstall: rm -f $(DESTDIR)$(DATADIR)/help.txt |