Changeset 7fa5c19 for Makefile

Timestamp:

2012-02-11T12:55:45Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

eb54f56

Parents:

23445b6

Message:

Rename SRCDIR directory to _SRCDIR_. I guess #907 was caused by SRCDIR
unexpectedly being set to something already.

File:

• Makefile (modified) (4 diffs)

Makefile

@@ -96 +96 @@
         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)
@@ -107 +107 @@
 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:
@@ -128 +128 @@
         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
@@ -161 +161 @@
         @$(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 $@