File adjust-installation-directories-for-openSUSE-SL... of Package iproute2

Overview Repositories Revisions Requests Users Attributes Meta

File adjust-installation-directories-for-openSUSE-SLE.patch of Package iproute2 (Revision 10b09744f30dc355771f1440b56f80da)

Currently displaying revision 10b09744f30dc355771f1440b56f80da , Show latest

From: Michal Kubecek <mkubecek@suse.cz>
Date: Fri, 15 Jan 2016 07:29:44 +0100
Subject: adjust installation directories for openSUSE/SLE
Patch-mainline: Never, SUSE specific

Match the directory layout of openSUSE and SLE.
---
 Makefile       | 4 ++--
 netem/Makefile | 6 ++++--
 tc/q_netem.c   | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 18de7dcb315b..d8702a769a07 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ endif
 
 PREFIX?=/usr
 LIBDIR?=$(PREFIX)/lib
-SBINDIR?=/sbin
+SBINDIR?=/usr/sbin
 CONFDIR?=/etc/iproute2
 DATADIR?=$(PREFIX)/share
 HDRDIR?=$(PREFIX)/include/iproute2
@@ -24,7 +24,7 @@ DBM_INCLUDE:=$(DESTDIR)/usr/include
 
 SHARED_LIBS = y
 
-DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\"
+DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" -DPKGDATADIR=\"$(DATADIR)/tc\"
 ifneq ($(SHARED_LIBS),y)
 DEFINES+= -DNO_SHARED_LIBS
 endif
diff --git a/netem/Makefile b/netem/Makefile
index a68e2fdb3037..efff5850d9c1 100644
--- a/netem/Makefile
+++ b/netem/Makefile
@@ -5,6 +5,8 @@ HOSTCC ?= $(CC)
 CCOPTS  = $(CBUILD_CFLAGS)
 LDLIBS += -lm
 
+LIBDIR = /usr/lib
+
 all: $(DISTGEN) $(DISTDATA)
 
 $(DISTGEN):
@@ -20,9 +22,9 @@ stats: stats.c
 	$(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
 
 install: all
-	mkdir -p $(DESTDIR)$(LIBDIR)/tc
+	mkdir -p $(DESTDIR)/usr/share/tc
 	for i in $(DISTDATA); \
-	do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \
+	do install -m 644 $$i $(DESTDIR)/usr/share/tc; \
 	done
 
 clean:
diff --git a/tc/q_netem.c b/tc/q_netem.c
index 0975ae111de9..3a7084563eaf 100644
--- a/tc/q_netem.c
+++ b/tc/q_netem.c
@@ -113,7 +113,7 @@ static int get_distribution(const char *type, __s16 *data, int maxdata)
 	char *line = NULL;
 	char name[128];
 
-	snprintf(name, sizeof(name), "%s/%s.dist", get_tc_lib(), type);
+	snprintf(name, sizeof(name), "%s/%s.dist", PKGDATADIR, type);
 	if ((f = fopen(name, "r")) == NULL) {
 		fprintf(stderr, "No distribution data for %s (%s: %s)\n",
 			type, name, strerror(errno));
-- 
2.14.1

Places

File adjust-installation-directories-for-openSUSE-SLE.patch of Package iproute2 (Revision 10b09744f30dc355771f1440b56f80da)

Places