summaryrefslogtreecommitdiffstats
path: root/package/hiawatha/hiawatha.mk
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2012-05-31 09:23:23 +0200
committerPeter Korsgaard <jacmet@sunsite.dk>2012-05-31 09:23:23 +0200
commitbdb4c3a6dc9efecc4d1e40fabf8cb9b3e0eb3ee2 (patch)
treed6012109e704c5e9abc709c23a7133a3d4b4f779 /package/hiawatha/hiawatha.mk
parent5b11223fb6cd0469becf49b0986868832c076bfc (diff)
parent2105ecbd86d04e446effa11108f6bd755ed5f19a (diff)
downloadbuildroot-novena-bdb4c3a6dc9efecc4d1e40fabf8cb9b3e0eb3ee2.tar.gz
buildroot-novena-bdb4c3a6dc9efecc4d1e40fabf8cb9b3e0eb3ee2.zip
Merge branch 'next'
Conflicts: toolchain/kernel-headers/Config.in
Diffstat (limited to 'package/hiawatha/hiawatha.mk')
-rw-r--r--package/hiawatha/hiawatha.mk9
1 files changed, 7 insertions, 2 deletions
diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk
index aa245f380..647c1e16c 100644
--- a/package/hiawatha/hiawatha.mk
+++ b/package/hiawatha/hiawatha.mk
@@ -1,4 +1,4 @@
-HIAWATHA_VERSION = 8.1
+HIAWATHA_VERSION = 8.3
HIAWATHA_SITE = http://www.hiawatha-webserver.org/files/
ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y)
@@ -8,6 +8,11 @@ endif
HIAWATHA_CONF_OPT += \
-DENABLE_TOOLKIT=OFF \
- -DENABLE_XSLT=OFF
+ -DENABLE_XSLT=OFF \
+ -DCONFIG_DIR=/etc/hiawatha \
+ -DLOG_DIR=/var/log \
+ -DPID_DIR=/var/run \
+ -DWEBROOT_DIR=/var/www/hiawatha \
+ -DWORK_DIR=/var/lib/hiawatha
$(eval $(call CMAKETARGETS))