patch-make_Makefile_linux 906 B

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