From: Nicolas Thill <nico@openwrt.org>
Date: Tue, 20 Sep 2005 07:41:52 +0000 (+0000)
Subject: fix dnet-config (remove references to /usr/{include,lib}), only install and remove... 
X-Git-Tag: reboot~31990
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=bf7dac0fb95ac0029cfd12c9a200f0192a9dbec7;p=openwrt%2Fopenwrt.git

fix dnet-config (remove references to /usr/{include,lib}), only install and remove what's needed in staging_dir

SVN-Revision: 1962
---

diff --git a/openwrt/package/libdnet/Makefile b/openwrt/package/libdnet/Makefile
index e47b34aff4..5501b6bd98 100644
--- a/openwrt/package/libdnet/Makefile
+++ b/openwrt/package/libdnet/Makefile
@@ -76,9 +76,10 @@ $(STAGING_DIR)/usr/lib/libdnet.so: $(PKG_BUILD_DIR)/.built
 	mkdir -p $(STAGING_DIR)/usr/bin
 	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/dnet-config $(STAGING_DIR)/usr/bin/
 	mkdir -p $(STAGING_DIR)/usr/include
-	cp -fpR $(PKG_INSTALL_DIR)/usr/include/dnet* $(STAGING_DIR)/usr/include/
+	cp -fpR $(PKG_INSTALL_DIR)/usr/include/dnet.h $(STAGING_DIR)/usr/include/
+	cp -fpR $(PKG_INSTALL_DIR)/usr/include/dnet $(STAGING_DIR)/usr/include/
 	mkdir -p $(STAGING_DIR)/usr/lib
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libdnet.* $(STAGING_DIR)/usr/lib/
+	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libdnet.{a,so*} $(STAGING_DIR)/usr/lib/
 	touch $@
 
 install-dev: $(STAGING_DIR)/usr/lib/libdnet.so
@@ -86,8 +87,9 @@ install-dev: $(STAGING_DIR)/usr/lib/libdnet.so
 uninstall-dev:
 	rm -rf \
 		$(STAGING_DIR)/usr/bin/dnet-config \
-		$(STAGING_DIR)/usr/include/dnet*  \
-		$(STAGING_DIR)/usr/lib/libdnet.* \
+		$(STAGING_DIR)/usr/include/dnet.h  \
+		$(STAGING_DIR)/usr/include/dnet  \
+		$(STAGING_DIR)/usr/lib/libdnet.{a,so*} \
 
 compile: install-dev
 clean: uninstall-dev
diff --git a/openwrt/package/libdnet/patches/libdnet-1.10-dnet_config.patch b/openwrt/package/libdnet/patches/libdnet-1.10-dnet_config.patch
new file mode 100644
index 0000000000..005ac3305c
--- /dev/null
+++ b/openwrt/package/libdnet/patches/libdnet-1.10-dnet_config.patch
@@ -0,0 +1,23 @@
+--- libdnet-1.10/dnet-config.in.orig	2001-10-19 03:29:00.000000000 +0200
++++ libdnet-1.10/dnet-config.in	2005-09-20 09:32:53.000000000 +0200
+@@ -45,10 +45,18 @@
+ done
+ 
+ if test "$echo_cflags" = "yes"; then
+-      echo -I@includedir@
++      includes=
++      if test "@includedir@" != "/usr/include" ; then
++             includes=-I@includedir@
++      fi
++      echo $includes
+ fi
+ 
+ if test "$echo_libs" = "yes"; then
+-      echo -L@libdir@ -ldnet @LIBS@
++      libs=
++      if test "@libdir@" != "/usr/lib" ; then
++             libs=-I@libdir@
++      fi
++      echo $libs -ldnet @LIBS@
+ fi      
+