* [PATCH 4/4] iproute2 - Fix up and simplify variables pointing to install directories. Define where is the are located the iproute2 config files. Get rid of trailing slashes for paths in several file.
@ 2012-03-01 16:46 Christoph J. Thompson
2012-04-12 16:51 ` Stephen Hemminger
0 siblings, 1 reply; 2+ messages in thread
From: Christoph J. Thompson @ 2012-03-01 16:46 UTC (permalink / raw
To: netdev
modified: Makefile
modified: ip/iplink.c
modified: tc/Makefile
modified: tc/tc_util.c
Signed-off-by: Christoph J. Thompson <cjsthompson@gmail.com>
---
Makefile | 11 +++++++----
ip/iplink.c | 2 +-
tc/Makefile | 2 +-
tc/tc_util.c | 2 +-
4 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index fb5f5d3..2d0192e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,11 @@
-DESTDIR=/usr/
ROOTDIR=$(DESTDIR)
-LIBDIR=/usr/lib/
+PREFIX=/usr
+LIBDIR=$(PREFIX)/lib
SBINDIR=/sbin
CONFDIR=/etc/iproute2
-DOCDIR=/share/doc/iproute2
-MANDIR=/share/man
+DATADIR=$(PREFIX)/share
+DOCDIR=$(DATADIR)/doc/iproute2
+MANDIR=$(DATADIR)/man
ARPDDIR=/var/lib/arpd
# Path to db_185.h include
@@ -17,6 +18,8 @@ ifneq ($(SHARED_LIBS),y)
DEFINES+= -DNO_SHARED_LIBS
endif
+DEFINES+=-DCONFDIR=\"$(CONFDIR)\"
+
#options if you have a bind>=4.9.4 libresolv (or, maybe, glibc)
LDLIBS=-lresolv
ADDLIB=
diff --git a/ip/iplink.c b/ip/iplink.c
index 6b051b6..72a9866 100644
--- a/ip/iplink.c
+++ b/ip/iplink.c
@@ -34,7 +34,7 @@
#define IPLINK_IOCTL_COMPAT 1
#ifndef LIBDIR
-#define LIBDIR "/usr/lib/"
+#define LIBDIR "/usr/lib"
#endif
static void usage(void) __attribute__((noreturn));
diff --git a/tc/Makefile b/tc/Makefile
index f523adc..be8cd5a 100644
--- a/tc/Makefile
+++ b/tc/Makefile
@@ -91,7 +91,7 @@ YACC := bison
LEX := flex
CFLAGS += -DYY_NO_INPUT
-MODDESTDIR := $(DESTDIR)$(patsubst /usr%,%,$(LIBDIR))/tc
+MODDESTDIR := $(DESTDIR)$(LIBDIR)/tc
%.so: %.c
$(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic $< -o $@
diff --git a/tc/tc_util.c b/tc/tc_util.c
index 5829d61..bd7f9e0 100644
--- a/tc/tc_util.c
+++ b/tc/tc_util.c
@@ -25,7 +25,7 @@
#include "tc_util.h"
#ifndef LIBDIR
-#define LIBDIR "/usr/lib/"
+#define LIBDIR "/usr/lib"
#endif
const char *get_tc_lib(void)
--
1.7.4.4
--
Jabber: heimdal@jabber.org
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 4/4] iproute2 - Fix up and simplify variables pointing to install directories. Define where is the are located the iproute2 config files. Get rid of trailing slashes for paths in several file.
2012-03-01 16:46 [PATCH 4/4] iproute2 - Fix up and simplify variables pointing to install directories. Define where is the are located the iproute2 config files. Get rid of trailing slashes for paths in several file Christoph J. Thompson
@ 2012-04-12 16:51 ` Stephen Hemminger
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Hemminger @ 2012-04-12 16:51 UTC (permalink / raw
To: Christoph J. Thompson; +Cc: netdev
On Thu, 1 Mar 2012 17:46:26 +0100
"Christoph J. Thompson" <cjsthompson@gmail.com> wrote:
> modified: Makefile
> modified: ip/iplink.c
> modified: tc/Makefile
> modified: tc/tc_util.c
>
> Signed-off-by: Christoph J. Thompson <cjsthompson@gmail.com>
All applied, but you need to format your patch changelog correctly.
Email subject line should be short summary (not a four sentences)
Email body should have the more complete changelog.
Skip the modified: stuff, that is either obvious or put it below
the signature separator --- so that merge program will drop it.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-04-12 16:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-01 16:46 [PATCH 4/4] iproute2 - Fix up and simplify variables pointing to install directories. Define where is the are located the iproute2 config files. Get rid of trailing slashes for paths in several file Christoph J. Thompson
2012-04-12 16:51 ` Stephen Hemminger
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 read-only IMAP folder(s) and NNTP newsgroup(s).