From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 15 May 2005 17:30:59 +0000 (+0000)
Subject: fix monit build
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=37cafbb30c7843d081e047cbcc160e9d289327bd;p=openwrt%2Fsvn-archive%2Farchive.git

fix monit build


SVN-Revision: 911
---

diff --git a/openwrt/package/monit/Makefile b/openwrt/package/monit/Makefile
index df51b3d3d9..269c9b8f2d 100644
--- a/openwrt/package/monit/Makefile
+++ b/openwrt/package/monit/Makefile
@@ -12,7 +12,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
 
@@ -48,10 +47,6 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
 
 $(PKG_BUILD_DIR)/.built:
 	$(MAKE) -C $(PKG_BUILD_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		install
 	touch $(PKG_BUILD_DIR)/.built
 
 $(IPKG_MONIT):
@@ -60,6 +55,6 @@ $(IPKG_MONIT):
 	install -d -m0755 $(IDIR_MONIT)/etc/init.d
 	install -m0755 ./files/monit.init $(IDIR_MONIT)/etc/init.d/monit
 	install -d -m0755 $(IDIR_MONIT)/usr/sbin
-	cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/monit $(IDIR_MONIT)/usr/sbin/
-	$(RSTRIP) $(IDIR_MONIT)
+	cp -fpR $(PKG_BUILD_DIR)/monit $(IDIR_MONIT)/usr/sbin/
+	$(STRIP) $(IDIR_MONIT)/usr/sbin/monit
 	$(IPKG_BUILD) $(IDIR_MONIT) $(PACKAGE_DIR)