EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
SVN-Revision: 1962
This commit is contained in:
Nicolas Thill 2005-09-20 07:41:52 +00:00
parent c00856544d
commit bf7dac0fb9
2 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openwrt/package/libdnet/Makefile
View File

@ -76,9 +76,10 @@ $(STAGING_DIR)/usr/lib/libdnet.so: $(PKG_BUILD_DIR)/.built
mkdir -p $(STAGING_DIR)/usr/bin mkdir -p $(STAGING_DIR)/usr/bin
cp -fpR $(PKG_INSTALL_DIR)/usr/bin/dnet-config $(STAGING_DIR)/usr/bin/ cp -fpR $(PKG_INSTALL_DIR)/usr/bin/dnet-config $(STAGING_DIR)/usr/bin/
mkdir -p $(STAGING_DIR)/usr/include 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 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 $@ touch $@
install-dev: $(STAGING_DIR)/usr/lib/libdnet.so install-dev: $(STAGING_DIR)/usr/lib/libdnet.so
@ -86,8 +87,9 @@ install-dev: $(STAGING_DIR)/usr/lib/libdnet.so
uninstall-dev: uninstall-dev:
rm -rf \ rm -rf \
$(STAGING_DIR)/usr/bin/dnet-config \ $(STAGING_DIR)/usr/bin/dnet-config \
$(STAGING_DIR)/usr/include/dnet* \ $(STAGING_DIR)/usr/include/dnet.h \
$(STAGING_DIR)/usr/lib/libdnet.* \ $(STAGING_DIR)/usr/include/dnet \
$(STAGING_DIR)/usr/lib/libdnet.{a,so*} \
compile: install-dev compile: install-dev
clean: uninstall-dev clean: uninstall-dev

23
openwrt/package/libdnet/patches/libdnet-1.10-dnet_config.patch Normal file
View File

@ -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