Changeset ba3506e

Timestamp:

2014-02-28T00:03:07Z (10 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:

• Makefile (modified) (6 diffs)

Makefile

@@ -91 +91 @@
 install-bin:
         mkdir -p $(DESTDIR)$(SBINDIR)
-        install -m 0755 $(OUTFILE) $(DESTDIR)$(SBINDIR)/$(OUTFILE)
+        $(INSTALL) -m 0755 $(OUTFILE) $(DESTDIR)$(SBINDIR)/$(OUTFILE)
 
 uninstall-bin:
@@ -98 +98 @@
 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
+        $(INSTALL) -m 0644 config.h $(DESTDIR)$(INCLUDEDIR)
+        for i in $(headers); do $(INSTALL) -m 0644 $(_SRCDIR_)$$i $(DESTDIR)$(INCLUDEDIR); done
         mkdir -p $(DESTDIR)$(PCDIR)
-        install -m 0644 bitlbee.pc $(DESTDIR)$(PCDIR)
+        $(INSTALL) -m 0644 bitlbee.pc $(DESTDIR)$(PCDIR)
 
 uninstall-dev:
@@ -110 +110 @@
 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:
@@ -123 +123 @@
 ifdef OTR_PI
         mkdir -p $(DESTDIR)$(PLUGINDIR)
-        install -m 0755 otr.so $(DESTDIR)$(PLUGINDIR)
+        $(INSTALL) -m 0755 otr.so $(DESTDIR)$(PLUGINDIR)
 endif
 
@@ -129 +129 @@
 ifdef SKYPE_PI
         mkdir -p $(DESTDIR)$(PLUGINDIR)
-        install -m 0755 skype.so $(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
@@ -147 +147 @@
 ifeq ($(shell id -u),0)
         mkdir -p $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
-        install -m 0644 init/bitlbee.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
-        install -m 0644 init/bitlbee@.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
-        install -m 0644 init/bitlbee.socket $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
+        $(INSTALL) -m 0644 init/bitlbee.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
+        $(INSTALL) -m 0644 init/bitlbee@.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
+        $(INSTALL) -m 0644 init/bitlbee.socket $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
 else
         @echo Not root, so not installing systemd files.