Index: protocols/Makefile
===================================================================
--- protocols/Makefile	(revision b5fe39bf8c462cfd19428cc0c099490cef3fcfd3)
+++ protocols/Makefile	(revision 7fa5c192c40cedb4111f0cfd3aaad9126861588b)
@@ -8,6 +8,6 @@
 
 -include ../Makefile.settings
-ifdef SRCDIR
-SRCDIR := $(SRCDIR)protocols/
+ifdef _SRCDIR_
+_SRCDIR_ := $(_SRCDIR_)protocols/
 endif
 
@@ -53,5 +53,5 @@
 $(objects): ../Makefile.settings Makefile
 
-$(objects): %.o: $(SRCDIR)%.c
+$(objects): %.o: $(_SRCDIR_)%.c
 	@echo '*' Compiling $<
 	@$(CC) -c $(CFLAGS) $< -o $@
Index: protocols/jabber/Makefile
===================================================================
--- protocols/jabber/Makefile	(revision b5fe39bf8c462cfd19428cc0c099490cef3fcfd3)
+++ protocols/jabber/Makefile	(revision 7fa5c192c40cedb4111f0cfd3aaad9126861588b)
@@ -8,6 +8,6 @@
 
 -include ../../Makefile.settings
-ifdef SRCDIR
-SRCDIR := $(SRCDIR)protocols/jabber/
+ifdef _SRCDIR_
+_SRCDIR_ := $(_SRCDIR_)protocols/jabber/
 endif
 
@@ -36,5 +36,5 @@
 $(objects): ../../Makefile.settings Makefile
 
-$(objects): %.o: $(SRCDIR)%.c
+$(objects): %.o: $(_SRCDIR_)%.c
 	@echo '*' Compiling $<
 	@$(CC) -c $(CFLAGS) $< -o $@
Index: protocols/msn/Makefile
===================================================================
--- protocols/msn/Makefile	(revision b5fe39bf8c462cfd19428cc0c099490cef3fcfd3)
+++ protocols/msn/Makefile	(revision 7fa5c192c40cedb4111f0cfd3aaad9126861588b)
@@ -8,6 +8,6 @@
 
 -include ../../Makefile.settings
-ifdef SRCDIR
-SRCDIR := $(SRCDIR)protocols/msn/
+ifdef _SRCDIR_
+_SRCDIR_ := $(_SRCDIR_)protocols/msn/
 endif
 
@@ -36,5 +36,5 @@
 $(objects): ../../Makefile.settings Makefile
 
-$(objects): %.o: $(SRCDIR)%.c
+$(objects): %.o: $(_SRCDIR_)%.c
 	@echo '*' Compiling $<
 	@$(CC) -c $(CFLAGS) $< -o $@
Index: protocols/oscar/Makefile
===================================================================
--- protocols/oscar/Makefile	(revision b5fe39bf8c462cfd19428cc0c099490cef3fcfd3)
+++ protocols/oscar/Makefile	(revision 7fa5c192c40cedb4111f0cfd3aaad9126861588b)
@@ -8,7 +8,7 @@
 
 -include ../../Makefile.settings
-ifdef SRCDIR
-SRCDIR := $(SRCDIR)protocols/oscar/
-CFLAGS += -I$(SRCDIR)
+ifdef _SRCDIR_
+_SRCDIR_ := $(_SRCDIR_)protocols/oscar/
+CFLAGS += -I$(_SRCDIR_)
 endif
 
@@ -37,5 +37,5 @@
 $(objects): ../../Makefile.settings Makefile
 
-$(objects): %.o: $(SRCDIR)%.c
+$(objects): %.o: $(_SRCDIR_)%.c
 	@echo '*' Compiling $<
 	@$(CC) -c $(CFLAGS) $< -o $@
Index: protocols/purple/Makefile
===================================================================
--- protocols/purple/Makefile	(revision b5fe39bf8c462cfd19428cc0c099490cef3fcfd3)
+++ protocols/purple/Makefile	(revision 7fa5c192c40cedb4111f0cfd3aaad9126861588b)
@@ -8,6 +8,6 @@
 
 -include ../../Makefile.settings
-ifdef SRCDIR
-SRCDIR := $(SRCDIR)protocols/purple/
+ifdef _SRCDIR_
+_SRCDIR_ := $(_SRCDIR_)protocols/purple/
 endif
 
@@ -37,5 +37,5 @@
 $(objects): ../../Makefile.settings Makefile
 
-$(objects): %.o: $(SRCDIR)%.c
+$(objects): %.o: $(_SRCDIR_)%.c
 	@echo '*' Compiling $<
 	@$(CC) -c $(CFLAGS) $< -o $@
Index: protocols/skype/Makefile
===================================================================
--- protocols/skype/Makefile	(revision b5fe39bf8c462cfd19428cc0c099490cef3fcfd3)
+++ protocols/skype/Makefile	(revision 7fa5c192c40cedb4111f0cfd3aaad9126861588b)
@@ -1,5 +1,5 @@
 -include ../../Makefile.settings
-ifdef SRCDIR
-SRCDIR := $(SRCDIR)protocols/skype/
+ifdef _SRCDIR_
+_SRCDIR_ := $(_SRCDIR_)protocols/skype/
 endif
 
@@ -25,7 +25,7 @@
 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
 
@@ -45,5 +45,5 @@
 endif
 
-client: $(SRCDIR)client.c
+client: $(_SRCDIR_)client.c
 
 autogen: configure.ac
@@ -103,5 +103,5 @@
 	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 . $<
Index: protocols/twitter/Makefile
===================================================================
--- protocols/twitter/Makefile	(revision b5fe39bf8c462cfd19428cc0c099490cef3fcfd3)
+++ protocols/twitter/Makefile	(revision 7fa5c192c40cedb4111f0cfd3aaad9126861588b)
@@ -8,6 +8,6 @@
 
 -include ../../Makefile.settings
-ifdef SRCDIR
-SRCDIR := $(SRCDIR)protocols/twitter/
+ifdef _SRCDIR_
+_SRCDIR_ := $(_SRCDIR_)protocols/twitter/
 endif
 
@@ -36,5 +36,5 @@
 $(objects): ../../Makefile.settings Makefile
 
-$(objects): %.o: $(SRCDIR)%.c
+$(objects): %.o: $(_SRCDIR_)%.c
 	@echo '*' Compiling $<
 	@$(CC) -c $(CFLAGS) $< -o $@
Index: protocols/yahoo/Makefile
===================================================================
--- protocols/yahoo/Makefile	(revision b5fe39bf8c462cfd19428cc0c099490cef3fcfd3)
+++ protocols/yahoo/Makefile	(revision 7fa5c192c40cedb4111f0cfd3aaad9126861588b)
@@ -8,6 +8,6 @@
 
 -include ../../Makefile.settings
-ifdef SRCDIR
-SRCDIR := $(SRCDIR)protocols/yahoo/
+ifdef _SRCDIR_
+_SRCDIR_ := $(_SRCDIR_)protocols/yahoo/
 endif
 
@@ -37,5 +37,5 @@
 $(objects): ../../Makefile.settings Makefile
 
-$(objects): %.o: $(SRCDIR)%.c
+$(objects): %.o: $(_SRCDIR_)%.c
 	@echo '*' Compiling $<
 	@$(CC) -c $(CFLAGS) $< -o $@
