Module: sip-router Branch: sr_3.0 Commit: 22350f4371eb7b7bf24c5bec32f8e083d587bc3a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=22350f43...

Author: Vincent Stemen vince.lists@ngtek.org Committer: Andrei Pelinescu-Onciul andrei@iptel.org Date: Wed Aug 11 16:40:41 2010 +0200

makefile: fix $DESTDIR

This fixes Makefile.defs to properly handle $DESTDIR as a base installation directory for packaging, etc (equivalent to BASEDIR).

Signed-off-by: Andrei Pelinescu-Onciul andrei@iptel.org (cherry picked from commit bef528185d7b2e6bfa4ae5ec4bfd4808e1dcf28f)

---

Makefile.defs | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Makefile.defs b/Makefile.defs index cd5538d..5f3a550 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -263,9 +263,8 @@ endif # Doxygen directory doxygen_dir=doc/doxygen

- # install location -DESTDIR ?= $(LOCALBASE) -PREFIX ?= $(DESTDIR) +# install location +PREFIX ?= $(LOCALBASE) prefix = $(PREFIX) # install path is $(basedir) $(prefix) # example: @@ -273,7 +272,7 @@ prefix = $(PREFIX) # basedir=/tmp # prefix=/usr/local

-BASEDIR ?= +BASEDIR ?= $(DESTDIR) basedir = $(BASEDIR) # install prefixes for various stuff cfg_prefix = $(basedir)$(prefix)