Rename SRCDIR directory to _SRCDIR_. I guess #907 was caused by SRCDIR

unexpectedly being set to something already.

8 files changed, 29 insertions, 29 deletions

diff --git a/protocols/Makefile b/protocols/Makefile
index 9e8d3fb9..e93f3b23 100644
--- a/protocols/Makefile
+++ b/protocols/Makefile
@@ -7,8 +7,8 @@
 ### DEFINITIONS
 
 -include ../Makefile.settings
-ifdef SRCDIR
-SRCDIR := $(SRCDIR)protocols/
+ifdef _SRCDIR_
+_SRCDIR_ := $(_SRCDIR_)protocols/
 endif
 
 # [SH] Program variables
@@ -52,7 +52,7 @@ protocols.o: $(objects) $(subdirs)
 
 $(objects): ../Makefile.settings Makefile
 
-$(objects): %.o: $(SRCDIR)%.c
+$(objects): %.o: $(_SRCDIR_)%.c
 	@echo '*' Compiling $<
 	@$(CC) -c $(CFLAGS) $< -o $@
 
diff --git a/protocols/jabber/Makefile b/protocols/jabber/Makefile
index 32946b18..20bc1259 100644
--- a/protocols/jabber/Makefile
+++ b/protocols/jabber/Makefile
@@ -7,8 +7,8 @@
 ### DEFINITIONS
 
 -include ../../Makefile.settings
-ifdef SRCDIR
-SRCDIR := $(SRCDIR)protocols/jabber/
+ifdef _SRCDIR_
+_SRCDIR_ := $(_SRCDIR_)protocols/jabber/
 endif
 
 # [SH] Program variables
@@ -35,7 +35,7 @@ distclean: clean
 
 $(objects): ../../Makefile.settings Makefile
 
-$(objects): %.o: $(SRCDIR)%.c
+$(objects): %.o: $(_SRCDIR_)%.c
 	@echo '*' Compiling $<
 	@$(CC) -c $(CFLAGS) $< -o $@
 
diff --git a/protocols/msn/Makefile b/protocols/msn/Makefile
index 8845d41b..49b8d597 100644
--- a/protocols/msn/Makefile
+++ b/protocols/msn/Makefile
@@ -7,8 +7,8 @@
 ### DEFINITIONS
 
 -include ../../Makefile.settings
-ifdef SRCDIR
-SRCDIR := $(SRCDIR)protocols/msn/
+ifdef _SRCDIR_
+_SRCDIR_ := $(_SRCDIR_)protocols/msn/
 endif
 
 # [SH] Program variables
@@ -35,7 +35,7 @@ distclean: clean
 
 $(objects): ../../Makefile.settings Makefile
 
-$(objects): %.o: $(SRCDIR)%.c
+$(objects): %.o: $(_SRCDIR_)%.c
 	@echo '*' Compiling $<
 	@$(CC) -c $(CFLAGS) $< -o $@
 
diff --git a/protocols/oscar/Makefile b/protocols/oscar/Makefile
index a83830df..b26484ec 100644
--- a/protocols/oscar/Makefile
+++ b/protocols/oscar/Makefile
@@ -7,9 +7,9 @@
 ### DEFINITIONS
 
 -include ../../Makefile.settings
-ifdef SRCDIR
-SRCDIR := $(SRCDIR)protocols/oscar/
-CFLAGS += -I$(SRCDIR)
+ifdef _SRCDIR_
+_SRCDIR_ := $(_SRCDIR_)protocols/oscar/
+CFLAGS += -I$(_SRCDIR_)
 endif
 
 # [SH] Program variables
@@ -36,7 +36,7 @@ distclean: clean
 
 $(objects): ../../Makefile.settings Makefile
 
-$(objects): %.o: $(SRCDIR)%.c
+$(objects): %.o: $(_SRCDIR_)%.c
 	@echo '*' Compiling $<
 	@$(CC) -c $(CFLAGS) $< -o $@
 
diff --git a/protocols/purple/Makefile b/protocols/purple/Makefile
index 5a096777..e02641c1 100644
--- a/protocols/purple/Makefile
+++ b/protocols/purple/Makefile
@@ -7,8 +7,8 @@
 ### DEFINITIONS
 
 -include ../../Makefile.settings
-ifdef SRCDIR
-SRCDIR := $(SRCDIR)protocols/purple/
+ifdef _SRCDIR_
+_SRCDIR_ := $(_SRCDIR_)protocols/purple/
 endif
 
 # [SH] Program variables
@@ -36,7 +36,7 @@ distclean: clean
 
 $(objects): ../../Makefile.settings Makefile
 
-$(objects): %.o: $(SRCDIR)%.c
+$(objects): %.o: $(_SRCDIR_)%.c
 	@echo '*' Compiling $<
 	@$(CC) -c $(CFLAGS) $< -o $@
 
diff --git a/protocols/skype/Makefile b/protocols/skype/Makefile
index e048e0bc..455a21f2 100644
--- a/protocols/skype/Makefile
+++ b/protocols/skype/Makefile
@@ -1,6 +1,6 @@
 -include ../../Makefile.settings
-ifdef SRCDIR
-SRCDIR := $(SRCDIR)protocols/skype/
+ifdef _SRCDIR_
+_SRCDIR_ := $(_SRCDIR_)protocols/skype/
 endif
 
 VERSION = 0.9.0
@@ -24,9 +24,9 @@ endif
 
 all: $(LIBS) $(MANPAGES)
 
-skype.$(SHARED_EXT): $(SRCDIR)skype.c config.mak
+skype.$(SHARED_EXT): $(_SRCDIR_)skype.c config.mak
 ifeq ($(BITLBEE),yes)
-	$(CC) $(CFLAGS) $(SHARED_FLAGS) -o skype.$(SHARED_EXT) $(SRCDIR)skype.c $(LDFLAGS)
+	$(CC) $(CFLAGS) $(SHARED_FLAGS) -o skype.$(SHARED_EXT) $(_SRCDIR_)skype.c $(LDFLAGS)
 endif
 
 install: all install-doc
@@ -44,7 +44,7 @@ ifeq ($(SKYPE4PY),yes)
 	$(INSTALL) -m644 skyped.cnf $(DESTDIR)$(sysconfdir)
 endif
 
-client: $(SRCDIR)client.c
+client: $(_SRCDIR_)client.c
 
 autogen: configure.ac
 	cp $(shell ls /usr/share/automake-*/install-sh | tail -n1) ./
@@ -102,6 +102,6 @@ Changelog: .git/refs/heads/master
 AUTHORS: .git/refs/heads/master
 	git shortlog -s -n |sed 's/.*\t//'> AUTHORS
 
-%.1: $(SRCDIR)%.txt $(SRCDIR)asciidoc.conf
-	a2x --asciidoc-opts="-f $(SRCDIR)asciidoc.conf" \
+%.1: $(_SRCDIR_)%.txt $(_SRCDIR_)asciidoc.conf
+	a2x --asciidoc-opts="-f $(_SRCDIR_)asciidoc.conf" \
 		-a bs_version=$(VERSION) -a bs_date=$(DATE) -f manpage -D . $<
diff --git a/protocols/twitter/Makefile b/protocols/twitter/Makefile
index 74f0ea11..a1ad2301 100644
--- a/protocols/twitter/Makefile
+++ b/protocols/twitter/Makefile
@@ -7,8 +7,8 @@
 ### DEFINITIONS
 
 -include ../../Makefile.settings
-ifdef SRCDIR
-SRCDIR := $(SRCDIR)protocols/twitter/
+ifdef _SRCDIR_
+_SRCDIR_ := $(_SRCDIR_)protocols/twitter/
 endif
 
 # [SH] Program variables
@@ -35,7 +35,7 @@ distclean: clean
 
 $(objects): ../../Makefile.settings Makefile
 
-$(objects): %.o: $(SRCDIR)%.c
+$(objects): %.o: $(_SRCDIR_)%.c
 	@echo '*' Compiling $<
 	@$(CC) -c $(CFLAGS) $< -o $@
 
diff --git a/protocols/yahoo/Makefile b/protocols/yahoo/Makefile
index 7908b773..d756d1e7 100644
--- a/protocols/yahoo/Makefile
+++ b/protocols/yahoo/Makefile
@@ -7,8 +7,8 @@
 ### DEFINITIONS
 
 -include ../../Makefile.settings
-ifdef SRCDIR
-SRCDIR := $(SRCDIR)protocols/yahoo/
+ifdef _SRCDIR_
+_SRCDIR_ := $(_SRCDIR_)protocols/yahoo/
 endif
 
 # [SH] Program variables
@@ -36,7 +36,7 @@ distclean: clean
 
 $(objects): ../../Makefile.settings Makefile
 
-$(objects): %.o: $(SRCDIR)%.c
+$(objects): %.o: $(_SRCDIR_)%.c
 	@echo '*' Compiling $<
 	@$(CC) -c $(CFLAGS) $< -o $@