X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/c5c15592a1ca8c53190eaf2eeff68461d010b592..006b5034f9bab869e7865b2540ffc65f9bdbb169:/package/osiris/Makefile

diff --git a/package/osiris/Makefile b/package/osiris/Makefile
index ca7056dd6..900a1491d 100644
--- a/package/osiris/Makefile
+++ b/package/osiris/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=osiris
-PKG_VERSION:=4.1.8
+PKG_VERSION:=4.2.0
 PKG_RELEASE:=1
-PKG_MD5SUM:=27a362ba5ad3025d5bca6d9c92196875
+PKG_MD5SUM:=ad30995660e506ee6d1d6460601f6107
 
 PKG_SOURCE_URL:=http://www.hostintegrity.com/osiris/data/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -23,7 +23,7 @@ $(PKG_BUILD_DIR)/.configured:
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+		LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
 		ac_cv_openssldir="$(STAGING_DIR)/usr" \
 		ac_cv_have_accrights_in_msghdr=no \
 		ac_cv_have_control_in_msghdr=yes \
@@ -49,22 +49,25 @@ $(PKG_BUILD_DIR)/.configured:
 		  $(DISABLE_NLS) \
 		  --with-osiris-user=root \
 		  --with-root-dir=/var/lib/osiris \
+		  --with-readline=no \
 	);
-	touch $(PKG_BUILD_DIR)/.configured
+	touch $@
 
 $(PKG_BUILD_DIR)/.built:
-	$(MAKE) -C $(PKG_BUILD_DIR)
+	rm -rf $(PKG_INSTALL_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
+		$(TARGET_CONFIGURE_OPTS) \
+		ar=$(TARGET_CROSS)ar \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		INTERACTIVE=0 \
-		install
-	touch $(PKG_BUILD_DIR)/.built
+		all install
+	touch $@
 
 $(IPKG_OSIRISD):
 	install -d -m0755 $(IDIR_OSIRISD)/etc/init.d
 	install -m0755 ./files/osirisd.init $(IDIR_OSIRISD)/etc/init.d/osirisd
 	install -d -m0755 $(IDIR_OSIRISD)/usr/sbin
-	cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/osirisd $(IDIR_OSIRISD)/usr/sbin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/osirisd $(IDIR_OSIRISD)/usr/sbin/
 	$(RSTRIP) $(IDIR_OSIRISD)
 	$(IPKG_BUILD) $(IDIR_OSIRISD) $(PACKAGE_DIR)