let ipkg fail when a package file to be installed is not found

[openwrt/staging/wigyori.git] / openwrt / package / xinetd / Makefile

diff --git a/openwrt/package/xinetd/Makefile b/openwrt/package/xinetd/Makefile
index 71b9cf2dea64319132e0969e2b1c4063dc3e65ae..a3e5d59e6a0647277087260752bf8f9a3c2be488 100644 (file)
--- a/openwrt/package/xinetd/Makefile
+++ b/openwrt/package/xinetd/Makefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xinetd
 PKG_VERSION:=2.3.13
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MD5SUM:=4295b5fe12350f09b5892b363348ac8b
 
 PKG_SOURCE_URL:=http://www.xinetd.org/
@@ -49,22 +49,23 @@ $(PKG_BUILD_DIR)/.configured:
                  --without-libwrap \
                  --with-loadavg \
        );
-       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) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
-               install
-       touch $(PKG_BUILD_DIR)/.built
+               build install
+       touch $@
 
 $(IPKG_XINETD):
        install -d -m0755 $(IDIR_XINETD)/etc
        install -m0644 ./files/xinetd.conf $(IDIR_XINETD)/etc/xinetd.conf
+       install -d -m0755 $(IDIR_XINETD)/etc/xinetd.d
        install -d -m0755 $(IDIR_XINETD)/etc/init.d
        install -m0755 ./files/xinetd.init $(IDIR_XINETD)/etc/init.d/xinetd
        install -d -m0755 $(IDIR_XINETD)/usr/sbin
-       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/xinetd $(IDIR_XINETD)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/xinetd $(IDIR_XINETD)/usr/sbin/
        $(RSTRIP) $(IDIR_XINETD)
        $(IPKG_BUILD) $(IDIR_XINETD) $(PACKAGE_DIR)