[sr-dev] git:master: makefile: fix $DESTDIR

Andrei Pelinescu-Onciul andrei at iptel.org
Wed Aug 11 16:42:18 CEST 2010


Module: sip-router
Branch: master
Commit: bef528185d7b2e6bfa4ae5ec4bfd4808e1dcf28f
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bef528185d7b2e6bfa4ae5ec4bfd4808e1dcf28f

Author: Vincent Stemen <vince.lists at ngtek.org>
Committer: Andrei Pelinescu-Onciul <andrei at 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 at iptel.org>

---

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

diff --git a/Makefile.defs b/Makefile.defs
index f6bf2c4..0efd157 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -271,9 +271,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:
@@ -281,7 +280,7 @@ prefix = $(PREFIX)
 #  basedir=/tmp
 #  prefix=/usr/local
 
-BASEDIR ?=
+BASEDIR ?= $(DESTDIR)
 basedir = $(BASEDIR)
 # install prefixes for various stuff
 cfg_prefix = $(basedir)$(prefix)




More information about the sr-dev mailing list