Fix build break in 64bit architectures

Change-Id: I34d50f8cb9bd5bc2f342551a4f5d5d5fa481c7b7
Signed-off-by: Semun Lee <semun.lee@samsung.com>

diff --git a/netem/Makefile b/netem/Makefile
index ba4c5a7..0fe4c8f 100644 (file)
--- a/netem/Makefile
+++ b/netem/Makefile
@@ -8,6 +8,8 @@ HOSTCC ?= $(CC)
 CCOPTS  = $(CBUILD_CFLAGS)
 LDLIBS += -lm
 
+MODDESTDIR ?= $(DESTDIR)$(LIBDIR)/tc
+
 all: $(DISTGEN) $(DISTDATA)
 
 $(DISTGEN):
@@ -23,9 +25,9 @@ stats: stats.c
        $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
 
 install: all
-       mkdir -p $(DESTDIR)$(LIBDIR)/tc
+       mkdir -p $(MODDESTDIR)
        for i in $(DISTDATA); \
-       do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \
+       do install -m 644 $$i $(MODDESTDIR); \
        done
 
 clean:

diff --git a/packaging/iproute2.spec b/packaging/iproute2.spec
index dbc3b06..1818743 100644 (file)
--- a/packaging/iproute2.spec
+++ b/packaging/iproute2.spec
@@ -60,8 +60,8 @@ install -d "$b"/{etc/,sbin/,usr/{bin,sbin,share/man/man{3,8}}}
 install -d "$b"/{%_includedir,%_libdir,/usr/share}
 export SBINDIR=%_sbindir
 export CONFDIR=/usr%{_sysconfdir}/iproute2
-%make_install \
-  MODDESTDIR="$b/%_libdir/tc"
+export MODDESTDIR="$b/%_libdir/tc"
+%make_install
 
 # We have m_xt
 rm -f "$b/%_libdir/tc/m_ipt.so"

diff --git a/tc/Makefile b/tc/Makefile
index f2ff86f..665ddfb 100644 (file)
--- a/tc/Makefile
+++ b/tc/Makefile
@@ -127,7 +127,7 @@ endif
 LEX := flex
 CFLAGS += -DYY_NO_INPUT
 
-MODDESTDIR := $(DESTDIR)$(LIBDIR)/tc
+MODDESTDIR ?= $(DESTDIR)$(LIBDIR)/tc
 
 %.so: %.c
        $(QUIET_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fpic $< -o $@