add common functions for the new config file format

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

diff --git a/openwrt/package/siproxd/Makefile b/openwrt/package/siproxd/Makefile
index 035881a..78571a6 100644 (file)
--- a/openwrt/package/siproxd/Makefile
+++ b/openwrt/package/siproxd/Makefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=siproxd
 PKG_VERSION:=0.5.11
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MD5SUM:=a614f60683f9ea9423573bc5d646c525
 
 PKG_SOURCE_URL:=@SF/siproxd
@@ -46,23 +46,23 @@ $(PKG_BUILD_DIR)/.configured:
                  $(DISABLE_NLS) \
                  --enable-shared \
        );
-       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
+               all install
+       touch $@
 
 $(IPKG_SIPROXD):
        install -d -m0755 $(IDIR_SIPROXD)/etc
-       cp -fpR $(PKG_INSTALL_DIR)/etc/siproxd.conf.example $(IDIR_SIPROXD)/etc/siproxd.conf
-       cp -fpR $(PKG_INSTALL_DIR)/etc/siproxd_passwd.cfg $(IDIR_SIPROXD)/etc/
+       $(CP) $(PKG_INSTALL_DIR)/etc/siproxd.conf.example $(IDIR_SIPROXD)/etc/siproxd.conf
+       $(CP) $(PKG_INSTALL_DIR)/etc/siproxd_passwd.cfg $(IDIR_SIPROXD)/etc/
        install -d -m0755 $(IDIR_SIPROXD)/etc/init.d
        install -m0755 files/siproxd.init $(IDIR_SIPROXD)/etc/init.d/siproxd
        install -d -m0755 $(IDIR_SIPROXD)/usr/sbin
-       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/siproxd $(IDIR_SIPROXD)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/siproxd $(IDIR_SIPROXD)/usr/sbin/
        $(RSTRIP) $(IDIR_SIPROXD)
        $(IPKG_BUILD) $(IDIR_SIPROXD) $(PACKAGE_DIR)