[package] libevent: move headers and libs to a specific sub-folder

And update nfs-kernel-server to use these new headers location

SVN-Revision: 32918

diff --git a/libs/libevent/Makefile b/libs/libevent/Makefile
index c00a0b15fb5baa968fc409cfab5e16768b4ef14b..781b87cd8492746c4a73e969eb2f37f3e98a2b67 100644 (file)
--- a/libs/libevent/Makefile
+++ b/libs/libevent/Makefile
@@ -52,10 +52,10 @@ MAKE_FLAGS += \
        CFLAGS="$(TARGET_CFLAGS)" \
 
 define Build/InstallDev
-       $(INSTALL_DIR) $(1)/usr/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-       $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{a,so} $(1)/usr/lib/
+       $(INSTALL_DIR) $(1)/usr/include/libevent
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/libevent/
+       $(INSTALL_DIR) $(1)/usr/lib/libevent
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{a,so} $(1)/usr/lib/libevent/
 endef
 
 define Package/libevent/install

diff --git a/net/nfs-kernel-server/Makefile b/net/nfs-kernel-server/Makefile
index c98a204f1cf855fceb4d1a81be0ef6ab7d0ee74a..aca76f61b21340c707fcc8973351266af47656c7 100644 (file)
--- a/net/nfs-kernel-server/Makefile
+++ b/net/nfs-kernel-server/Makefile
@@ -67,8 +67,10 @@ define Package/nfs-utils/description
   Updated mount.nfs command - allows mounting nfs4 volumes
 endef
 
-TARGET_CFLAGS += -I$(PKG_BUILD_DIR)/lib -I$(STAGING_DIR)/usr/include -Drpc_uint=uint
-TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib $(LIBRPC)
+TARGET_CFLAGS += -I$(PKG_BUILD_DIR)/lib -I$(STAGING_DIR)/usr/include/libevent \
+                -I$(STAGING_DIR)/usr/include/ -Drpc_uint=uint
+TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib $(LIBRPC) \
+                 -L$(STAGING_DIR)/usr/lib/libevent
 
 CONFIGURE_ARGS += \
        --disable-gss \