diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-10-16 20:10:34 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-10-16 20:10:34 +0200 |
| commit | 94c0a7374ee0c980a34e134f93dca1d46e7af7bc (patch) | |
| tree | 134e5415fb5d2ccc613bdab46c97f5fa3df8c730 /package/mini_httpd | |
| parent | 07c250a84c1cc9ace9ebf00800f2125461a2662b (diff) | |
| parent | 084c175e59e9ea61c68154ad9982adcd918cbfcf (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/freeradius-server/Makefile
package/nss/patches/patch-mozilla_security_coreconf_Linux_mk
Diffstat (limited to 'package/mini_httpd')
| -rw-r--r-- | package/mini_httpd/Makefile | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/package/mini_httpd/Makefile b/package/mini_httpd/Makefile index 0c2ccc13b..9cb08d804 100644 --- a/package/mini_httpd/Makefile +++ b/package/mini_httpd/Makefile @@ -37,15 +37,14 @@ do-build: SSL_INC="-I${STAGING_DIR}/usr/include" \ SSL_LIBS="-L${STAGING_DIR}/usr/lib -lssl -lcrypto" \ all - (cd ${WRKBUILD}; mv mini_httpd mini_httpd-openssl; ) do-install: - ${INSTALL_DIR} ${IDIR_MINI_HTTPD_OPENSSL}/etc + ${INSTALL_DIR} ${IDIR_MINI_HTTPD}/etc ${INSTALL_DATA} ./files/mini_httpd-ssl.conf \ - ${IDIR_MINI_HTTPD_OPENSSL}/etc/mini_httpd.conf - install -m0600 ./files/mini_httpd.pem ${IDIR_MINI_HTTPD_OPENSSL}/etc/ - ${INSTALL_DIR} ${IDIR_MINI_HTTPD_OPENSSL}/usr/sbin - ${INSTALL_BIN} ${WRKBUILD}/mini_httpd-openssl \ - ${IDIR_MINI_HTTPD_OPENSSL}/usr/sbin/mini_httpd + ${IDIR_MINI_HTTPD}/etc/mini_httpd.conf + install -m0600 ./files/mini_httpd.pem ${IDIR_MINI_HTTPD}/etc/ + ${INSTALL_DIR} ${IDIR_MINI_HTTPD}/usr/sbin + ${INSTALL_BIN} ${WRKBUILD}/mini_httpd \ + ${IDIR_MINI_HTTPD}/usr/sbin/mini_httpd include ${TOPDIR}/mk/pkg-bottom.mk |