Changeset ba3506e


Ignore:
Timestamp:
2014-02-28T00:03:07Z (9 years ago)
Author:
dequis <dx@…>
Branches:
master
Children:
b42269a
Parents:
1bed2e1
git-author:
Robert Scheck <robert@…> (28-02-14 00:03:07)
git-committer:
dequis <dx@…> (28-02-14 00:03:07)
Message:

Makefile: Use $INSTALL instead of the hardcoded command (Ticket #725)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    r1bed2e1 rba3506e  
    9191install-bin:
    9292        mkdir -p $(DESTDIR)$(SBINDIR)
    93         install -m 0755 $(OUTFILE) $(DESTDIR)$(SBINDIR)/$(OUTFILE)
     93        $(INSTALL) -m 0755 $(OUTFILE) $(DESTDIR)$(SBINDIR)/$(OUTFILE)
    9494
    9595uninstall-bin:
     
    9898install-dev:
    9999        mkdir -p $(DESTDIR)$(INCLUDEDIR)
    100         install -m 0644 config.h $(DESTDIR)$(INCLUDEDIR)
    101         for i in $(headers); do install -m 0644 $(_SRCDIR_)$$i $(DESTDIR)$(INCLUDEDIR); done
     100        $(INSTALL) -m 0644 config.h $(DESTDIR)$(INCLUDEDIR)
     101        for i in $(headers); do $(INSTALL) -m 0644 $(_SRCDIR_)$$i $(DESTDIR)$(INCLUDEDIR); done
    102102        mkdir -p $(DESTDIR)$(PCDIR)
    103         install -m 0644 bitlbee.pc $(DESTDIR)$(PCDIR)
     103        $(INSTALL) -m 0644 bitlbee.pc $(DESTDIR)$(PCDIR)
    104104
    105105uninstall-dev:
     
    110110install-etc:
    111111        mkdir -p $(DESTDIR)$(ETCDIR)
    112         install -m 0644 $(_SRCDIR_)motd.txt $(DESTDIR)$(ETCDIR)/motd.txt
    113         install -m 0644 $(_SRCDIR_)bitlbee.conf $(DESTDIR)$(ETCDIR)/bitlbee.conf
     112        $(INSTALL) -m 0644 $(_SRCDIR_)motd.txt $(DESTDIR)$(ETCDIR)/motd.txt
     113        $(INSTALL) -m 0644 $(_SRCDIR_)bitlbee.conf $(DESTDIR)$(ETCDIR)/bitlbee.conf
    114114
    115115uninstall-etc:
     
    123123ifdef OTR_PI
    124124        mkdir -p $(DESTDIR)$(PLUGINDIR)
    125         install -m 0755 otr.so $(DESTDIR)$(PLUGINDIR)
     125        $(INSTALL) -m 0755 otr.so $(DESTDIR)$(PLUGINDIR)
    126126endif
    127127
     
    129129ifdef SKYPE_PI
    130130        mkdir -p $(DESTDIR)$(PLUGINDIR)
    131         install -m 0755 skype.so $(DESTDIR)$(PLUGINDIR)
     131        $(INSTALL) -m 0755 skype.so $(DESTDIR)$(PLUGINDIR)
    132132        mkdir -p $(DESTDIR)$(ETCDIR)/../skyped $(DESTDIR)$(BINDIR)
    133         install -m 0644 $(_SRCDIR_)protocols/skype/skyped.cnf $(DESTDIR)$(ETCDIR)/../skyped/skyped.cnf
    134         install -m 0644 $(_SRCDIR_)protocols/skype/skyped.conf.dist $(DESTDIR)$(ETCDIR)/../skyped/skyped.conf
    135         install -m 0755 $(_SRCDIR_)protocols/skype/skyped.py $(DESTDIR)$(BINDIR)/skyped
     133        $(INSTALL) -m 0644 $(_SRCDIR_)protocols/skype/skyped.cnf $(DESTDIR)$(ETCDIR)/../skyped/skyped.cnf
     134        $(INSTALL) -m 0644 $(_SRCDIR_)protocols/skype/skyped.conf.dist $(DESTDIR)$(ETCDIR)/../skyped/skyped.conf
     135        $(INSTALL) -m 0755 $(_SRCDIR_)protocols/skype/skyped.py $(DESTDIR)$(BINDIR)/skyped
    136136        make -C protocols/skype install-doc
    137137endif
     
    147147ifeq ($(shell id -u),0)
    148148        mkdir -p $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
    149         install -m 0644 init/bitlbee.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
    150         install -m 0644 init/bitlbee@.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
    151         install -m 0644 init/bitlbee.socket $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
     149        $(INSTALL) -m 0644 init/bitlbee.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
     150        $(INSTALL) -m 0644 init/bitlbee@.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
     151        $(INSTALL) -m 0644 init/bitlbee.socket $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
    152152else
    153153        @echo Not root, so not installing systemd files.
Note: See TracChangeset for help on using the changeset viewer.