Merged revisions 85684 via svnmerge from
authorJason Parker <jparker@digium.com>
Mon, 15 Oct 2007 20:16:48 +0000 (20:16 +0000)
committerJason Parker <jparker@digium.com>
Mon, 15 Oct 2007 20:16:48 +0000 (20:16 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

(closes issue #10938)
........
r85684 | qwell | 2007-10-15 15:15:51 -0500 (Mon, 15 Oct 2007) | 5 lines

Properly use DESTDIR in 'config' target.
Do not try to run chkconfig or similar if using DESTDIR.

Issue 10938, patch by cabal95.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@85685 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Makefile

index 8700a3b..25c0108 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -637,20 +637,20 @@ progdocs:
 config:
        @if [ "${OSARCH}" = "linux-gnu" ]; then \
                if [ -f /etc/redhat-release -o -f /etc/fedora-release ]; then \
-                       $(INSTALL) -m 755 contrib/init.d/rc.redhat.asterisk /etc/rc.d/init.d/asterisk; \
-                       /sbin/chkconfig --add asterisk; \
+                       $(INSTALL) -m 755 contrib/init.d/rc.redhat.asterisk $(DESTDIR)/etc/rc.d/init.d/asterisk; \
+                       if [ -z "$(DESTDIR)" ]; then /sbin/chkconfig --add asterisk; fi; \
                elif [ -f /etc/debian_version ]; then \
-                       $(INSTALL) -m 755 contrib/init.d/rc.debian.asterisk /etc/init.d/asterisk; \
-                       /usr/sbin/update-rc.d asterisk start 10 2 3 4 5 . stop 91 2 3 4 5 .; \
+                       $(INSTALL) -m 755 contrib/init.d/rc.debian.asterisk $(DESTDIR)/etc/init.d/asterisk; \
+                       if [ -z "$(DESTDIR)" ]; then /usr/sbin/update-rc.d asterisk start 10 2 3 4 5 . stop 91 2 3 4 5 .; fi; \
                elif [ -f /etc/gentoo-release ]; then \
-                       $(INSTALL) -m 755 contrib/init.d/rc.gentoo.asterisk /etc/init.d/asterisk; \
-                       /sbin/rc-update add asterisk default; \
+                       $(INSTALL) -m 755 contrib/init.d/rc.gentoo.asterisk $(DESTDIR)/etc/init.d/asterisk; \
+                       if [ -z "$(DESTDIR)" ]; then /sbin/rc-update add asterisk default; fi; \
                elif [ -f /etc/mandrake-release ]; then \
-                       $(INSTALL) -m 755 contrib/init.d/rc.mandrake.asterisk /etc/rc.d/init.d/asterisk; \
-                       /sbin/chkconfig --add asterisk; \
+                       $(INSTALL) -m 755 contrib/init.d/rc.mandrake.asterisk $(DESTDIR)/etc/rc.d/init.d/asterisk; \
+                       if [ -z "$(DESTDIR)" ]; then /sbin/chkconfig --add asterisk; fi; \
                elif [ -f /etc/SuSE-release -o -f /etc/novell-release ]; then \
-                       $(INSTALL) -m 755 contrib/init.d/rc.suse.asterisk /etc/init.d/asterisk; \
-                       /sbin/chkconfig --add asterisk; \
+                       $(INSTALL) -m 755 contrib/init.d/rc.suse.asterisk $(DESTDIR)/etc/init.d/asterisk; \
+                       if [ -z "$(DESTDIR)" ]; then /sbin/chkconfig --add asterisk; fi; \
                elif [ -f /etc/slackware-version ]; then \
                        echo "Slackware is not currently supported, although an init script does exist for it." \
                else \