diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2005-05-15 17:30:59 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2005-05-15 17:30:59 +0000 |
| commit | 6c80669a567699ea56e4600c32e49cd3086e82fa (patch) | |
| tree | 123f9144aab4ed27e97b8569b81559f186ba8126 | |
| parent | a3839ccb5442bf7f2dbbb47f80488bf640212be5 (diff) | |
| download | upstream-6c80669a567699ea56e4600c32e49cd3086e82fa.tar.gz upstream-6c80669a567699ea56e4600c32e49cd3086e82fa.tar.bz2 upstream-6c80669a567699ea56e4600c32e49cd3086e82fa.zip | |
fix monit build
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@911 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/monit/Makefile | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/package/monit/Makefile b/package/monit/Makefile index df51b3d3d9..269c9b8f2d 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 @@ -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) |