Changeset 168d3bb


Ignore:
Timestamp:
2014-10-05T20:45:20Z (5 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:
1 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    rf329dfc r168d3bb  
    1111# Program variables
    1212objects = 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
    13 headers = $(wildcard *.h lib/*.h protocols/*.h)
     13headers = $(wildcard $(_SRCDIR_)*.h $(_SRCDIR_)lib/*.h $(_SRCDIR_)protocols/*.h)
    1414subdirs = lib protocols
    1515
     
    9494        mkdir -p $(DESTDIR)$(INCLUDEDIR)
    9595        $(INSTALL) -m 0644 config.h $(DESTDIR)$(INCLUDEDIR)
    96         for i in $(headers); do $(INSTALL) -m 0644 $(_SRCDIR_)$$i $(DESTDIR)$(INCLUDEDIR); done
     96        for i in $(headers); do $(INSTALL) -m 0644 $$i $(DESTDIR)$(INCLUDEDIR); done
    9797        mkdir -p $(DESTDIR)$(PCDIR)
    9898        $(INSTALL) -m 0644 bitlbee.pc $(DESTDIR)$(PCDIR)
     
    141141install-systemd: systemd
    142142ifdef SYSTEMDSYSTEMUNITDIR
    143 ifeq ($(shell id -u),0)
    144143        mkdir -p $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
    145144        $(INSTALL) -m 0644 init/bitlbee.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
     
    147146        $(INSTALL) -m 0644 $(_SRCDIR_)init/bitlbee.socket $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
    148147else
    149         @echo Not root, so not installing systemd files.
    150 endif
     148        @echo SYSTEMDSYSTEMUNITDIR not set, not installing systemd unit files.
    151149endif
    152150
Note: See TracChangeset for help on using the changeset viewer.