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

unexpectedly being set to something already.
yourealwaysbe · Feb 11, 2012 · 7fa5c19 · 7fa5c19
1 parent 23445b6
commit 7fa5c19
Show file tree

Hide file tree

Showing 14 changed files with 52 additions and 52 deletions.
diff --git a/Makefile b/Makefile
@@ -95,7 +95,7 @@ uninstall-bin:
 install-dev:
 	mkdir -p $(DESTDIR)$(INCLUDEDIR)
 	install -m 0644 config.h $(DESTDIR)$(INCLUDEDIR)
-	for i in $(headers); do install -m 0644 $(SRCDIR)$$i $(DESTDIR)$(INCLUDEDIR); done
+	for i in $(headers); do install -m 0644 $(_SRCDIR_)$$i $(DESTDIR)$(INCLUDEDIR); done
 	mkdir -p $(DESTDIR)$(PCDIR)
 	install -m 0644 bitlbee.pc $(DESTDIR)$(PCDIR)
 
@@ -106,8 +106,8 @@ uninstall-dev:
 
 install-etc:
 	mkdir -p $(DESTDIR)$(ETCDIR)
-	install -m 0644 $(SRCDIR)motd.txt $(DESTDIR)$(ETCDIR)/motd.txt
-	install -m 0644 $(SRCDIR)bitlbee.conf $(DESTDIR)$(ETCDIR)/bitlbee.conf
+	install -m 0644 $(_SRCDIR_)motd.txt $(DESTDIR)$(ETCDIR)/motd.txt
+	install -m 0644 $(_SRCDIR_)bitlbee.conf $(DESTDIR)$(ETCDIR)/bitlbee.conf
 
 uninstall-etc:
 	rm -f $(DESTDIR)$(ETCDIR)/motd.txt
@@ -127,9 +127,9 @@ ifdef SKYPE_PI
 	mkdir -p $(DESTDIR)$(PLUGINDIR)
 	install -m 0755 skype.so $(DESTDIR)$(PLUGINDIR)
 	mkdir -p $(DESTDIR)$(ETCDIR)/../skyped $(DESTDIR)$(BINDIR)
-	install -m 0644 $(SRCDIR)protocols/skype/skyped.cnf $(DESTDIR)$(ETCDIR)/../skyped/skyped.cnf
-	install -m 0644 $(SRCDIR)protocols/skype/skyped.conf.dist $(DESTDIR)$(ETCDIR)/../skyped/skyped.conf
-	install -m 0755 $(SRCDIR)protocols/skype/skyped.py $(DESTDIR)$(BINDIR)/skyped
+	install -m 0644 $(_SRCDIR_)protocols/skype/skyped.cnf $(DESTDIR)$(ETCDIR)/../skyped/skyped.cnf
+	install -m 0644 $(_SRCDIR_)protocols/skype/skyped.conf.dist $(DESTDIR)$(ETCDIR)/../skyped/skyped.conf
+	install -m 0755 $(_SRCDIR_)protocols/skype/skyped.py $(DESTDIR)$(BINDIR)/skyped
 	make -C protocols/skype install-doc
 endif
 
@@ -160,15 +160,15 @@ tar:
 $(subdirs):
 	@$(MAKE) -C $@ $(MAKECMDGOALS)
 
-$(OTR_PI): %.so: $(SRCDIR)%.c
+$(OTR_PI): %.so: $(_SRCDIR_)%.c
 	@echo '*' Building plugin $@
 	@$(CC) $(CFLAGS) -fPIC -shared $(LDFLAGS) $< -o $@ $(OTRFLAGS)
 
-$(SKYPE_PI): $(SRCDIR)protocols/skype/skype.c
+$(SKYPE_PI): $(_SRCDIR_)protocols/skype/skype.c
 	@echo '*' Building plugin skype
 	@$(CC) $(CFLAGS) -fPIC -shared $< -o $@
 
-$(objects): %.o: $(SRCDIR)%.c
+$(objects): %.o: $(_SRCDIR_)%.c
 	@echo '*' Compiling $<
 	@$(CC) -c $(CFLAGS) $< -o $@
 

diff --git a/configure b/configure
@@ -155,7 +155,7 @@ if [ "$srcdir" != "$currdir" ]; then
 		rm -rf .bzr
 	fi
 	
-	echo "SRCDIR=$srcdir/" >> Makefile.settings
+	echo "_SRCDIR_=$srcdir/" >> Makefile.settings
 	CFLAGS="$CFLAGS -I${dst}"
 else
 	srcdir=$PWD

diff --git 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
@@ -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

diff --git a/lib/Makefile b/lib/Makefile
@@ -7,8 +7,8 @@
 ### DEFINITIONS
 
 -include ../Makefile.settings
-ifdef SRCDIR
-SRCDIR := $(SRCDIR)lib/
+ifdef _SRCDIR_
+_SRCDIR_ := $(_SRCDIR_)lib/
 endif
 
 # [SH] Program variables
@@ -39,7 +39,7 @@ lib.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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 $@
 

diff --git a/tests/Makefile b/tests/Makefile
@@ -1,6 +1,6 @@
 -include ../Makefile.settings
-ifdef SRCDIR
-SRCDIR := $(SRCDIR)tests/
+ifdef _SRCDIR_
+_SRCDIR_ := $(_SRCDIR_)tests/
 endif
 
 LFLAGS +=-lcheck
@@ -21,6 +21,6 @@ check: $(test_objs) $(addprefix ../, $(main_objs)) ../protocols/protocols.o ../l
 	@echo '*' Linking $@
 	@$(CC) $(CFLAGS) -o $@ $^ $(LFLAGS) $(EFLAGS)
 
-%.o: $(SRCDIR)%.c
+%.o: $(_SRCDIR_)%.c
 	@echo '*' Compiling $<
 	@$(CC) -c $(CFLAGS) $< -o $@