diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-16 19:52:45 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-16 19:52:45 +0100 |
| commit | aaa312e56871e89b97704e5ac8c686fe7966c122 (patch) | |
| tree | 63f6a6c3e89152025de942a0e68153a5cb868ecb /package/olsrd/patches/patch-make_Makefile_linux | |
| parent | 9d097a780c0ffe2c9dbe146046d5b68123c47708 (diff) | |
| parent | b1e843d40eea9bc684436f4635018b7c19eb93ea (diff) | |
Merge branch 'master' of git+ssh://www.openadk.org/git/openadk
Conflicts:
TODO
Diffstat (limited to 'package/olsrd/patches/patch-make_Makefile_linux')
| -rw-r--r-- | package/olsrd/patches/patch-make_Makefile_linux | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/package/olsrd/patches/patch-make_Makefile_linux b/package/olsrd/patches/patch-make_Makefile_linux deleted file mode 100644 index d3ca1cdee..000000000 --- a/package/olsrd/patches/patch-make_Makefile_linux +++ /dev/null @@ -1,23 +0,0 @@ -$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 |