diff options
Diffstat (limited to 'package/mini_httpd/Makefile')
| -rw-r--r-- | package/mini_httpd/Makefile | 39 |
1 files changed, 6 insertions, 33 deletions
diff --git a/package/mini_httpd/Makefile b/package/mini_httpd/Makefile index 2065a9698..0c2ccc13b 100644 --- a/package/mini_httpd/Makefile +++ b/package/mini_httpd/Makefile @@ -7,18 +7,16 @@ PKG_NAME:= mini-httpd PKG_VERSION:= 1.19 PKG_RELEASE:= 10 PKG_MD5SUM:= 7c68293ad265ecfe2edea917912f6f1f -PKG_DESCR:= A small HTTP server +PKG_DESCR:= A small HTTP server with SSL PKG_MULTI:= 1 PKG_SECTION:= www -ifneq ($(ADK_PACKAGE_MINI_HTTPD_OPENSSL),) PKG_DEPENDS:= libopenssl -PKG_BUILDDEP+= openssl -endif -PKG_URL:= http://www.acme.com/software/mini_httpd +PKG_BUILDDEP:= openssl +PKG_URL:= http://www.acme.com/software/mini_httpd/ PKG_SITES:= http://www.acme.com/software/mini_httpd/ -PKG_DESCR_1:= htpasswd utility -PKG_DESCR_2:= A small HTTP server with SSL support +PKG_SUBPKGS:= MINI_HTTPD MINI_HTTPD_HTPASSWD +PKGSD_HTPASSWD:= htpasswd utility DISTFILES:= mini_httpd-${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/mini_httpd-${PKG_VERSION} @@ -26,16 +24,13 @@ WRKDIST= ${WRKDIR}/mini_httpd-${PKG_VERSION} include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,MINI_HTTPD,mini-httpd,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,MINI_HTTPD_HTPASSWD,mini-httpd-htpasswd,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_1},${PKG_SECTION})) -$(eval $(call PKG_template,MINI_HTTPD_OPENSSL,mini-httpd-openssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_2},${PKG_SECTION})) +$(eval $(call PKG_template,MINI_HTTPD_HTPASSWD,mini-httpd-htpasswd,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_HTPASSWD},${PKG_SECTION})) CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual do-build: - # with OpenSSL -ifneq (${ADK_PACKAGE_MINI_HTTPD_OPENSSL},) ${MAKE} -C ${WRKBUILD} \ CC="${TARGET_CC}" \ SSL_DEFS="-DUSE_SSL -DHAVE_OPENSSL" \ @@ -43,29 +38,8 @@ ifneq (${ADK_PACKAGE_MINI_HTTPD_OPENSSL},) SSL_LIBS="-L${STAGING_DIR}/usr/lib -lssl -lcrypto" \ all (cd ${WRKBUILD}; mv mini_httpd mini_httpd-openssl; ) - ${MAKE} -C ${WRKBUILD} clean -endif - # without SSL -ifneq (${ADK_PACKAGE_MINI_HTTPD},) - ${MAKE} -C ${WRKBUILD} \ - CC="${TARGET_CC}" \ - all -endif do-install: - # without SSL -ifneq (${ADK_PACKAGE_MINI_HTTPD},) - ${INSTALL_DIR} ${IDIR_MINI_HTTPD}/etc - ${INSTALL_DATA} ./files/mini_httpd.conf \ - ${IDIR_MINI_HTTPD}/etc/mini_httpd.conf - ${INSTALL_DIR} ${IDIR_MINI_HTTPD}/usr/sbin - ${INSTALL_BIN} ${WRKBUILD}/mini_httpd ${IDIR_MINI_HTTPD}/usr/sbin/ - ${INSTALL_DIR} ${IDIR_MINI_HTTPD_HTPASSWD}/usr/sbin - ${INSTALL_BIN} ${WRKBUILD}/htpasswd \ - ${IDIR_MINI_HTTPD_HTPASSWD}/usr/sbin/ -endif - # with OpenSSL -ifneq (${ADK_PACKAGE_MINI_HTTPD_OPENSSL},) ${INSTALL_DIR} ${IDIR_MINI_HTTPD_OPENSSL}/etc ${INSTALL_DATA} ./files/mini_httpd-ssl.conf \ ${IDIR_MINI_HTTPD_OPENSSL}/etc/mini_httpd.conf @@ -73,6 +47,5 @@ ifneq (${ADK_PACKAGE_MINI_HTTPD_OPENSSL},) ${INSTALL_DIR} ${IDIR_MINI_HTTPD_OPENSSL}/usr/sbin ${INSTALL_BIN} ${WRKBUILD}/mini_httpd-openssl \ ${IDIR_MINI_HTTPD_OPENSSL}/usr/sbin/mini_httpd -endif include ${TOPDIR}/mk/pkg-bottom.mk |