fix ar7 image builder

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

diff --git a/openwrt/package/mini_httpd/Makefile b/openwrt/package/mini_httpd/Makefile
index 2261b54..da976ef 100644 (file)
--- a/openwrt/package/mini_httpd/Makefile
+++ b/openwrt/package/mini_httpd/Makefile
@@ -16,12 +16,13 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/mini_httpd-$(PKG_VERSION)
 include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,MINI_HTTPD,mini-httpd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,MINI_HTTPD,mini-httpd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))

+$(eval $(call PKG_template,MINI_HTTPD_HTPASSWD,mini-httpd-htpasswd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))

 $(eval $(call PKG_template,MINI_HTTPD_MATRIXSSL,mini-httpd-matrixssl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,MINI_HTTPD_OPENSSL,mini-httpd-openssl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 
 $(PKG_BUILD_DIR)/.configured:
 $(eval $(call PKG_template,MINI_HTTPD_MATRIXSSL,mini-httpd-matrixssl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,MINI_HTTPD_OPENSSL,mini-httpd-openssl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 
 $(PKG_BUILD_DIR)/.configured:

-       cp -f ./files/matrixssl_helper.{c,h} $(PKG_BUILD_DIR)/
+       $(CP) ./files/matrixssl_helper.{c,h} $(PKG_BUILD_DIR)/

        touch $@
 
 $(PKG_BUILD_DIR)/.built:
        touch $@
 
 $(PKG_BUILD_DIR)/.built:


@@ -71,6 +72,12 @@ $(IPKG_MINI_HTTPD):
        $(RSTRIP) $(IDIR_MINI_HTTPD)
        $(IPKG_BUILD) $(IDIR_MINI_HTTPD) $(PACKAGE_DIR)
 
        $(RSTRIP) $(IDIR_MINI_HTTPD)
        $(IPKG_BUILD) $(IDIR_MINI_HTTPD) $(PACKAGE_DIR)
 

+$(IPKG_MINI_HTTPD_HTPASSWD):
+       install -d -m0755 $(IDIR_MINI_HTTPD_HTPASSWD)/usr/sbin
+       install -m0755 $(PKG_BUILD_DIR)/htpasswd $(IDIR_MINI_HTTPD_HTPASSWD)/usr/sbin/
+       $(RSTRIP) $(IDIR_MINI_HTTPD_HTPASSWD)
+       $(IPKG_BUILD) $(IDIR_MINI_HTTPD_HTPASSWD) $(PACKAGE_DIR)
+

 $(IPKG_MINI_HTTPD_MATRIXSSL):
        install -d -m0755 $(IDIR_MINI_HTTPD_MATRIXSSL)/etc
        install -m0644 ./files/mini_httpd-ssl.conf $(IDIR_MINI_HTTPD_MATRIXSSL)/etc/mini_httpd.conf
 $(IPKG_MINI_HTTPD_MATRIXSSL):
        install -d -m0755 $(IDIR_MINI_HTTPD_MATRIXSSL)/etc
        install -m0644 ./files/mini_httpd-ssl.conf $(IDIR_MINI_HTTPD_MATRIXSSL)/etc/mini_httpd.conf