diff options
| author | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-09-20 07:41:52 +0000 |
|---|---|---|
| committer | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-09-20 07:41:52 +0000 |
| commit | a3983df964fbe544726bd215dfaf52c9f97c4de0 (patch) | |
| tree | 2ab6291ca03ca48ba1a0845138d089ec4974cbdc | |
| parent | a3bb6621971680030e4d1c207bb0cf280eccd0e2 (diff) | |
fix dnet-config (remove references to /usr/{include,lib}),
only install and remove what's needed in staging_dir
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1962 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/libdnet/Makefile | 10 | ||||
| -rw-r--r-- | package/libdnet/patches/libdnet-1.10-dnet_config.patch | 23 |
2 files changed, 29 insertions, 4 deletions
diff --git a/package/libdnet/Makefile b/package/libdnet/Makefile index e47b34aff..5501b6bd9 100644 --- a/package/libdnet/Makefile +++ b/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/package/libdnet/patches/libdnet-1.10-dnet_config.patch b/package/libdnet/patches/libdnet-1.10-dnet_config.patch new file mode 100644 index 000000000..005ac3305 --- /dev/null +++ b/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 + |