Add fix from whiterussian

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

diff --git a/openwrt/package/chillispot/Makefile b/openwrt/package/chillispot/Makefile
index e2be170..81937aa 100644 (file)
--- a/openwrt/package/chillispot/Makefile
+++ b/openwrt/package/chillispot/Makefile
@@ -15,6 +15,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk

+

 $(eval $(call PKG_template,CHILLISPOT,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 $(PKG_BUILD_DIR)/.configured:
 $(eval $(call PKG_template,CHILLISPOT,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 $(PKG_BUILD_DIR)/.configured:


@@ -49,18 +50,18 @@ $(PKG_BUILD_DIR)/.configured:
        );
        touch $@
 
        );
        touch $@
 

-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               $(TARGET_CONFIGURE_OPTS)
+$(PKG_BUILD_DIR)/.built:
+       rm -rf $(PKG_INSTALL_DIR)

        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \

+               $(TARGET_CONFIGURE_OPTS) \

                DESTDIR="$(PKG_INSTALL_DIR)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \

-               install
-       touch $(PKG_BUILD_DIR)/.built
+               all install
+       touch $@

 
 $(IPKG_CHILLISPOT):
        install -m0755 -d $(IDIR_CHILLISPOT)/etc/init.d
 
 $(IPKG_CHILLISPOT):
        install -m0755 -d $(IDIR_CHILLISPOT)/etc/init.d

-       install -m0755 ./ipkg/$(PKG_NAME).init $(IDIR_CHILLISPOT)/etc/init.d/chilli
+       install -m0755 ./files/$(PKG_NAME).init $(IDIR_CHILLISPOT)/etc/init.d/chilli

        install -m0755 -d $(IDIR_CHILLISPOT)/etc
        install -m0644 $(PKG_BUILD_DIR)/doc/chilli.conf $(IDIR_CHILLISPOT)/etc/
        install -m0755 -d $(IDIR_CHILLISPOT)/usr/sbin
        install -m0755 -d $(IDIR_CHILLISPOT)/etc
        install -m0644 $(PKG_BUILD_DIR)/doc/chilli.conf $(IDIR_CHILLISPOT)/etc/
        install -m0755 -d $(IDIR_CHILLISPOT)/usr/sbin