olsrd: removing make install call not necessary for building the OpenWRT package

SVN-Revision: 32629

diff --git a/net/olsrd/Makefile b/net/olsrd/Makefile
index 63c7fe498e42e2d6032fdcc3774c2c0f77879037..e176185d32a500e3456d7a856d44b76aa0203637 100644 (file)
--- a/net/olsrd/Makefile
+++ b/net/olsrd/Makefile
@@ -9,14 +9,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=olsrd
 PKG_VERSION:=0.6.3
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.olsr.org/releases/0.6
 
 PKG_MD5SUM:=b28ed2e3dc6c529ab690f1c805ad32a2
 PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -155,11 +154,6 @@ define Build/Compile
        $(call Build/Compile/Default,libs)
 endef
 
-define Build/Install
-       $(call Build/Install/Default,install)
-       $(call Build/Install/Default,install_libs)
-endef
-
 define Package/olsrd/install
        $(INSTALL_DIR) $(1)/etc/config
        $(INSTALL_DATA) ./files/olsrd.config $(1)/etc/config/olsrd

diff --git a/net/olsrd/patches/900-force_copy_olsrd_conf_file.patch b/net/olsrd/patches/900-force_copy_olsrd_conf_file.patch
deleted file mode 100644 (file)
index 7b42670..0000000
--- a/net/olsrd/patches/900-force_copy_olsrd_conf_file.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -128,7 +128,7 @@ install_olsrd:     install_bin
-               @echo can be found at files/olsrd.conf.default.lq
-               @echo ==========================================================
-               mkdir -p $(ETCDIR)
--              -cp -i files/olsrd.conf.default.lq $(CFGFILE)
-+              -cp -f files/olsrd.conf.default.lq $(CFGFILE)
-               @echo -------------------------------------------
-               @echo Edit $(CFGFILE) before running olsrd!!
-               @echo -------------------------------------------