matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.

Signed-off-by: Christoph J. Thompson <cjsthompson@gmail.com>
This commit is contained in:
Christoph J. Thompson 2012-03-01 17:46:26 +01:00 committed by Stephen Hemminger
parent 761a1e6028
commit 5c434a9e5a
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -1,10 +1,11 @@
DESTDIR=/usr/
ROOTDIR=$(DESTDIR) ROOTDIR=$(DESTDIR)
LIBDIR=/usr/lib/ PREFIX=/usr
LIBDIR=$(PREFIX)/lib
SBINDIR=/sbin SBINDIR=/sbin
CONFDIR=/etc/iproute2 CONFDIR=/etc/iproute2
DOCDIR=/share/doc/iproute2 DATADIR=$(PREFIX)/share
MANDIR=/share/man DOCDIR=$(DATADIR)/doc/iproute2
MANDIR=$(DATADIR)/man
ARPDDIR=/var/lib/arpd ARPDDIR=/var/lib/arpd
# Path to db_185.h include # Path to db_185.h include
@ -17,6 +18,8 @@ ifneq ($(SHARED_LIBS),y)
DEFINES+= -DNO_SHARED_LIBS DEFINES+= -DNO_SHARED_LIBS
endif endif
DEFINES+=-DCONFDIR=\"$(CONFDIR)\"
#options if you have a bind>=4.9.4 libresolv (or, maybe, glibc) #options if you have a bind>=4.9.4 libresolv (or, maybe, glibc)
LDLIBS=-lresolv LDLIBS=-lresolv
ADDLIB= ADDLIB=

2
ip/iplink.c
View File

@ -34,7 +34,7 @@
#define IPLINK_IOCTL_COMPAT 1 #define IPLINK_IOCTL_COMPAT 1
#ifndef LIBDIR #ifndef LIBDIR
#define LIBDIR "/usr/lib/" #define LIBDIR "/usr/lib"
#endif #endif
static void usage(void) __attribute__((noreturn)); static void usage(void) __attribute__((noreturn));

2
tc/Makefile
View File

@ -91,7 +91,7 @@ YACC := bison
LEX := flex LEX := flex
CFLAGS += -DYY_NO_INPUT CFLAGS += -DYY_NO_INPUT
MODDESTDIR := $(DESTDIR)$(patsubst /usr%,%,$(LIBDIR))/tc MODDESTDIR := $(DESTDIR)$(LIBDIR)/tc
%.so: %.c %.so: %.c
$(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic $< -o $@ $(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic $< -o $@

2
tc/tc_util.c
View File

@ -25,7 +25,7 @@
#include "tc_util.h" #include "tc_util.h"
#ifndef LIBDIR #ifndef LIBDIR
#define LIBDIR "/usr/lib/" #define LIBDIR "/usr/lib"
#endif #endif
const char *get_tc_lib(void) const char *get_tc_lib(void)