remove duplicate code

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

diff --git a/openwrt/package/xinetd/Makefile b/openwrt/package/xinetd/Makefile
index 71b9cf2..3b22bec 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_NAME:=xinetd
 PKG_VERSION:=2.3.13

-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_MD5SUM:=4295b5fe12350f09b5892b363348ac8b
 
 PKG_SOURCE_URL:=http://www.xinetd.org/
 PKG_MD5SUM:=4295b5fe12350f09b5892b363348ac8b
 
 PKG_SOURCE_URL:=http://www.xinetd.org/


@@ -49,19 +49,20 @@ $(PKG_BUILD_DIR)/.configured:
                  --without-libwrap \
                  --with-loadavg \
        );
                  --without-libwrap \
                  --with-loadavg \
        );

-       touch $(PKG_BUILD_DIR)/.configured
+       touch $@

 
 $(PKG_BUILD_DIR)/.built:
 
 $(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)" \
        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
 
 $(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
        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