Fix libproc installation (#1389)

[openwrt/svn-archive/archive.git] / admin / osiris / Makefile

diff --git a/admin/osiris/Makefile b/admin/osiris/Makefile
index 81a180758c61704adc91c121143e8b2f461fec5f..98fab57bb36428fa4876b615ec3526864e8c7c7b 100644 (file)
--- a/admin/osiris/Makefile
+++ b/admin/osiris/Makefile
@@ -12,13 +12,12 @@ PKG_NAME:=osiris
 PKG_VERSION:=4.2.1
 PKG_RELEASE:=1
 
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://osiris.shmoo.com/data/
 PKG_MD5SUM:=11445f7d8dec737f0be89357f5c5bcae
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -28,7 +27,6 @@ define Package/osirisd
   CATEGORY:=Administration
   DEPENDS:=+libopenssl
   TITLE:=Host integrity monitoring system (scanning agent)
-  DESCRIPTION:=an Host Integrity Monitoring System (scanning agent)
   URL:=http://www.hostintegrity.com/osiris
 endef
 
@@ -42,8 +40,6 @@ define Build/Configure
 endef
 
 define Build/Compile   
-       rm -rf $(PKG_INSTALL_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
@@ -52,10 +48,10 @@ define Build/Compile
 endef
 
 define Package/osirisd/install 
-       install -d -m0755 $(1)/etc/init.d
-       install -m0755 ./files/osirisd.init $(1)/etc/init.d/osirisd
-       install -d -m0755 $(1)/usr/sbin
+       $(INSTALL_DIR) $(1)/usr/sbin
        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/osirisd $(1)/usr/sbin/
+       $(INSTALL_DIR) $(1)/etc/init.d
+       $(INSTALL_BIN) ./files/osirisd.init $(1)/etc/init.d/osirisd
 endef
 
 $(eval $(call BuildPackage,osirisd))