Changeset 168d3bb

Timestamp:

2014-10-05T20:45:20Z (10 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

5cb21d1, c27a923

Parents:

f329dfc (diff), ebe2c5e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from dx, fixes two build issues.

File:

• Makefile (modified) (4 diffs)

Makefile

@@ -11 +11 @@
 # Program variables
 objects = bitlbee.o dcc.o help.o ipc.o irc.o irc_im.o irc_channel.o irc_commands.o irc_send.o irc_user.o irc_util.o nick.o $(OTR_BI) query.o root_commands.o set.o storage.o $(STORAGE_OBJS) unix.o conf.o log.o
-headers = $(wildcard *.h lib/*.h protocols/*.h)
+headers = $(wildcard $(_SRCDIR_)*.h $(_SRCDIR_)lib/*.h $(_SRCDIR_)protocols/*.h)
 subdirs = lib protocols
 
@@ -94 +94 @@
         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 $$i $(DESTDIR)$(INCLUDEDIR); done
         mkdir -p $(DESTDIR)$(PCDIR)
         $(INSTALL) -m 0644 bitlbee.pc $(DESTDIR)$(PCDIR)
@@ -141 +141 @@
 install-systemd: systemd
 ifdef SYSTEMDSYSTEMUNITDIR
-ifeq ($(shell id -u),0)
         mkdir -p $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
         $(INSTALL) -m 0644 init/bitlbee.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
@@ -147 +146 @@
         $(INSTALL) -m 0644 $(_SRCDIR_)init/bitlbee.socket $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
 else
-        @echo Not root, so not installing systemd files.
-endif
+        @echo SYSTEMDSYSTEMUNITDIR not set, not installing systemd unit files.
 endif