Permalink
Browse files

prepare for 1.82

  • Loading branch information...
1 parent e1e92fc commit 08933dfdf0426f7860743fea9b30270fd68c44d7 @klacke committed May 28, 2009
Showing with 6 additions and 4 deletions.
  1. +1 −1 include.mk.in
  2. +2 −2 src/yaws_config.erl
  3. +3 −1 win32/mkinstaller.sh
View
2 include.mk.in
@@ -3,7 +3,7 @@
PREFIX = @prefix@
prefix = ${PREFIX}
-ETCDIR = @sysconfdir@/yaws
+ETCDIR = @sysconfdir@
VARDIR = @localstatedir@
DVILATEX = @DVILATEX@
View
4 src/yaws_config.erl
@@ -32,11 +32,11 @@
paths() ->
case yaws:getuid() of
{ok, "0"} -> %% root
- [yaws_generated:etcdir() ++ "/yaws.conf"];
+ [yaws_generated:etcdir() ++ "/yaws/yaws.conf"];
_ -> %% developer
[filename:join([yaws:home(), "yaws.conf"]),
"./yaws.conf",
- yaws_generated:etcdir() ++ "/yaws.conf"]
+ yaws_generated:etcdir() ++ "/yaws/yaws.conf"]
end.
View
4 win32/mkinstaller.sh
@@ -19,7 +19,9 @@ test -d "$INSTALL_BUILDER" || {
exit 13
}
-echo "-define(HAVE_SENDFILE, false). " > ../src/yaws_configure.hrl
+(cd ../src; make clean)
+echo "" > ../src/yaws_configure.hrl
+(cd ../doc; make docs)
(cd ../src; make)

0 comments on commit 08933df

Please sign in to comment.