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 13/14] batctl: Introduce PREFIX as standard installation prefix
Date: Sat, 21 May 2011 14:28:17 +0200 [thread overview]
Message-ID: <1305980898-30494-13-git-send-email-sven@narfation.org> (raw)
In-Reply-To: <1305980898-30494-1-git-send-email-sven@narfation.org>
cmake and configure (generated by autotools) use a prefix configuration
which is by default /usr/local to define to which all other paths are
relative to. SBINDIR is then defined as $PREFIX/sbin but can also be
redefined.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
Makefile | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index b5aa6ca..7ac72ed 100755
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@
# 02110-1301, USA
#
-# batctl build and install configuration
+# batctl build
BINARY_NAME = batctl
OBJ = main.o bat-hosts.o functions.o sys.o debug.o ping.o traceroute.o tcpdump.o list-batman.o hash.o vis.o debugfs.o bisect.o
@@ -46,7 +46,8 @@ COMPILE.c = $(Q_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c
LINK.o = $(Q_LD)$(CC) $(LDFLAGS) $(TARGET_ARCH)
# standard install paths
-SBINDIR = /usr/sbin
+PREFIX = /usr/local
+SBINDIR = $(PREFIX)/sbin
# try to generate revision
REVISION = $(shell if [ -d .git ]; then echo $$(git describe --always --dirty 2> /dev/null || echo "[unknown]"); fi)
--
1.7.5.1
next prev 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 ` [B.A.T.M.A.N.] [PATCH 12/14] batctl: Rename INSTALL_PREFIX to DESTDIR Sven Eckelmann
2011-05-22 10:09 ` Marek Lindner
2011-05-21 12:28 ` Sven Eckelmann [this message]
2011-05-22 10:11 ` [B.A.T.M.A.N.] [PATCH 13/14] batctl: Introduce PREFIX as standard installation prefix 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-13-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).