b.a.t.m.a.n.lists.open-mesh.org archive mirror
 help / color / mirror / Atom feed
From: Sven Eckelmann <sven@narfation.org>
To: b.a.t.m.a.n@lists.open-mesh.org
Subject: [B.A.T.M.A.N.] [PATCH 12/14] batctl: Rename INSTALL_PREFIX to DESTDIR
Date: Sat, 21 May 2011 14:28:16 +0200	[thread overview]
Message-ID: <1305980898-30494-12-git-send-email-sven@narfation.org> (raw)
In-Reply-To: <1305980898-30494-1-git-send-email-sven@narfation.org>

Makefile generators like cmake or configure (generated by autotools)
usually use DESTDIR to allow the modification of the "root" path without
affecting other build steps.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index c2b07e7..b5aa6ca 100755
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ COMPILE.c = $(Q_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c
 LINK.o = $(Q_LD)$(CC) $(LDFLAGS) $(TARGET_ARCH)
 
 # standard install paths
-SBINDIR = $(INSTALL_PREFIX)/usr/sbin
+SBINDIR = /usr/sbin
 
 # try to generate revision
 REVISION = $(shell if [ -d .git ]; then echo $$(git describe --always --dirty 2> /dev/null || echo "[unknown]"); fi)
@@ -67,8 +67,8 @@ clean:
 	$(RM) $(BINARY_NAME) $(OBJ) $(DEP)
 
 install: $(BINARY_NAME)
-	$(MKDIR) $(SBINDIR)
-	$(INSTALL) -m 0755 $(BINARY_NAME) $(SBINDIR)
+	$(MKDIR) $(DESTDIR)$(SBINDIR)
+	$(INSTALL) -m 0755 $(BINARY_NAME) $(DESTDIR)$(SBINDIR)
 
 # load dependencies
 DEP = $(OBJ:.o=.d)
-- 
1.7.5.1


  parent reply	other threads:[~2011-05-21 12:28 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-21 12:28 [B.A.T.M.A.N.] [PATCH 01/14] batctl: Remove optimisation and debugging options Sven Eckelmann
2011-05-21 12:28 ` [B.A.T.M.A.N.] [PATCH 02/14] batctl: Don't automatically build in parallel Sven Eckelmann
2011-05-22  9:32   ` Marek Lindner
2011-05-21 12:28 ` [B.A.T.M.A.N.] [PATCH 03/14] batctl: Remove unused Makefile variables Sven Eckelmann
2011-05-22  9:33   ` Marek Lindner
2011-05-21 12:28 ` [B.A.T.M.A.N.] [PATCH 04/14] batctl: Directly specify objects in Makefile Sven Eckelmann
2011-05-22  9:38   ` Marek Lindner
2011-05-21 12:28 ` [B.A.T.M.A.N.] [PATCH 05/14] batctl: Provide shebang to inform about interpreter Sven Eckelmann
2011-05-22  9:41   ` Marek Lindner
2011-05-21 12:28 ` [B.A.T.M.A.N.] [PATCH 06/14] batctl: Mark makefile targets without output as PHONY Sven Eckelmann
2011-05-22  9:41   ` Marek Lindner
2011-05-21 12:28 ` [B.A.T.M.A.N.] [PATCH 07/14] batctl: Only define CC when not already specified Sven Eckelmann
2011-05-22  9:42   ` Marek Lindner
2011-05-21 12:28 ` [B.A.T.M.A.N.] [PATCH 08/14] batctl: Build binary before installing it Sven Eckelmann
2011-05-22  9:43   ` Marek Lindner
2011-05-21 12:28 ` [B.A.T.M.A.N.] [PATCH 09/14] batctl: Reorder Makefile for better readability Sven Eckelmann
2011-05-22  9:46   ` Marek Lindner
2011-05-21 12:28 ` [B.A.T.M.A.N.] [PATCH 10/14] batctl: Use standard-like build rules Sven Eckelmann
2011-05-22 10:07   ` Marek Lindner
2011-05-21 12:28 ` [B.A.T.M.A.N.] [PATCH 11/14] batctl: Make called tools in clean and install configurable Sven Eckelmann
2011-05-22 10:07   ` Marek Lindner
2011-05-21 12:28 ` Sven Eckelmann [this message]
2011-05-22 10:09   ` [B.A.T.M.A.N.] [PATCH 12/14] batctl: Rename INSTALL_PREFIX to DESTDIR Marek Lindner
2011-05-21 12:28 ` [B.A.T.M.A.N.] [PATCH 13/14] batctl: Introduce PREFIX as standard installation prefix Sven Eckelmann
2011-05-22 10:11   ` Marek Lindner
2011-05-21 12:28 ` [B.A.T.M.A.N.] [PATCH 14/14] batctl: Install manpage Sven Eckelmann
2011-05-22 10:12   ` Marek Lindner
2011-05-22  9:29 ` [B.A.T.M.A.N.] [PATCH 01/14] batctl: Remove optimisation and debugging options Marek Lindner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1305980898-30494-12-git-send-email-sven@narfation.org \
    --to=sven@narfation.org \
    --cc=b.a.t.m.a.n@lists.open-mesh.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).