blob: d3ca1cdee1a7474316765d1f1cc9c458f961c4ad (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
|
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
--- olsrd-0.6.0.orig/make/Makefile.linux 2010-03-31 19:03:53.000000000 +0200
+++ olsrd-0.6.0/make/Makefile.linux 2010-10-10 14:34:11.000000000 +0200
@@ -4,7 +4,7 @@
ARCH := $(shell uname -m)
DESTDIR ?=
-LIBDIR = $(DESTDIR)$(shell if [ "$(ARCH)" = "x86_64" -a -d "/usr/lib64" ]; then echo "/usr/lib64"; else echo "/usr/lib"; fi)
+LIBDIR = $(DESTDIR)/usr/lib
SRCS += $(wildcard src/linux/*.c src/unix/*.c)
HDRS += $(wildcard src/linux/*.h src/unix/*.h)
@@ -13,8 +13,8 @@ CPPFLAGS += -Dlinux -DLINUX_NETLINK_ROU
LIBS +=
PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)
-INSTALL_LIB = install -D -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \
- /sbin/ldconfig -n $(LIBDIR)
+INSTALL_LIB = install -d -m 755 $(LIBDIR); \
+ install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME);
ifdef OLSRD_PLUGIN
GENERATE_PIC = true
|
