Skip to content
Browse files

prepare for 1.70

git-svn-id: https://erlyaws.svn.sourceforge.net/svnroot/erlyaws/trunk/yaws@1139 9fbdc01b-0d2c-0410-bfb7-fb27d70d8b52
  • Loading branch information...
1 parent 03d1e23 commit 697fa9d18c6573e0ef7fe657e0f2709776910ef0 @klacke committed Sep 6, 2007
Showing with 3 additions and 2 deletions.
  1. +2 −1 scripts/Install
  2. +1 −1 scripts/gentoo/conf.d.yaws
View
3 scripts/Install
@@ -41,7 +41,8 @@ if [ -f /etc/gentoo-release ]; then
chmod a+rwx ${destdir}/${vardir}/run/yaws
cp gentoo/init.d.yaws ${destdir}/${etcdir}/init.d/yaws
chmod +x ${destdir}/${etcdir}/init.d/yaws
- sed -e "s;%prefix%;$p;g" gentoo/conf.d.yaws > ${destdir}/${etcdir}/conf.d/yaws
+ sed -e "s;%prefix%;$p;g" gentoo/conf.d.yaws | \
+ sed -e "s;%etcdir%;$e;g" > ${destdir}/${etcdir}/conf.d/yaws
elif [ -f /etc/redhat-release ]; then
install -d ${destdir}/${etcdir}/init.d
sed -e "s;%prefix%;$p;g" redhat/yaws.init.d > ${destdir}/${etcdir}/init.d/yaws
View
2 scripts/gentoo/conf.d.yaws
@@ -15,7 +15,7 @@ YAWS_EXEC=%prefix%/bin/yaws
# The Yaws config file
-YAWS_CONF_FILE=/etc/yaws.conf
+YAWS_CONF_FILE=%etcdir%/yaws.conf
# The start options
YAWS_START_OPTS="--daemon --heart --id ${YAWS_ID} --conf ${YAWS_CONF_FILE}"

0 comments on commit 697fa9d

Please sign in to comment.
Something went wrong with that request. Please try again.