X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fmonit%2FMakefile;h=bbb7c867018b26cc3c140872b5eba584d8ad6223;hb=08fd6bda6451b3dff2cd82cfde6f5393a1018dd5;hp=df51b3d3d9897b617e250191a8676146fc239340;hpb=4893a2447542fbc8b833bb34de6a467abd1ab2ce;p=openwrt-10.03%2F.git

diff --git a/package/monit/Makefile b/package/monit/Makefile
index df51b3d3d..bbb7c8670 100644
--- a/package/monit/Makefile
+++ b/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
 
@@ -44,15 +43,11 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
 		  $(DISABLE_NLS) \
 		  --without-ssl \
 	);
-	touch $(PKG_BUILD_DIR)/.configured
+	touch $@
 
 $(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
+	touch $@
 
 $(IPKG_MONIT):
 	install -d -m0755 $(IDIR_MONIT)/etc
@@ -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)