Permalink
Browse files

""

git-svn-id: https://erlyaws.svn.sourceforge.net/svnroot/erlyaws/trunk/yaws@400 9fbdc01b-0d2c-0410-bfb7-fb27d70d8b52
  • Loading branch information...
klacke committed May 4, 2003
1 parent 7d47975 commit 3a3459ca2fe7f0b19f140ffa2c2bee35ec2d5eec
Showing with 21 additions and 22 deletions.
  1. +5 −3 include.mk.in
  2. +10 −9 scripts/Install
  3. +1 −1 scripts/Makefile
  4. +1 −1 scripts/gentoo/conf.d.yaws
  5. +3 −7 scripts/gentoo/yaws.ebuild
  6. +1 −1 scripts/yaws.init.d
View
@@ -1,8 +1,10 @@
###-*-makefile-*- ; force emacs to enter makefile-mode
-INSTALLPREFIX = @prefix@
-ETCDIR = @sysconfdir@
-VARDIR = @localstatedir@
+
+PREFIX = @prefix@
+ETCDIR = $(DESTDIR)@sysconfdir@
+VARDIR = $(DESTDIR)@localstatedir@
+INSTALLPREFIX = $(DESTDIR)$(PREFIX)
ERL=@ERL@
ERLC=@ERLC@
View
@@ -2,17 +2,18 @@
prefix=$1
-erl=$2
-etcdir=$3
+installprefix=$2
+erl=$3
+etcdir=$4
. ../vsn.mk
y=yaws-${YAWS_VSN}
+p=${prefix}
-
-sh ./mangle ${prefix}/lib/yaws ${erl} yaws.ss ${prefix}/bin/yaws
-install -d ${prefix}/lib/yaws/examples/ebin
-install -d ${prefix}/lib/yaws/examples/include
-chmod +x ${prefix}/bin/yaws
+sh ./mangle ${prefix}/lib/yaws ${erl} yaws.ss ${installprefix}/bin/yaws
+install -d ${installprefix}/lib/yaws/examples/ebin
+install -d ${installprefix}/lib/yaws/examples/include
+chmod +x ${installprefix}/bin/yaws
if [ -f ${etcdir}/yaws.conf ]; then
t=${etcdir}/yaws.conf.template
else
@@ -27,11 +28,11 @@ if [ -f /etc/gentoo-release ]; then
install -d ${etcdir}/conf.d/
cp gentoo/init.d.yaws ${etcdir}/init.d/yaws
chmod +x ${etcdir}/init.d/yaws
- cp gentoo/conf.d.yaws ${etcdir}/conf.d/yaws
+ sed -e "s;%prefix%;$p;g" gentoo/conf.d.yaws > ${etcdir}/conf.d/yaws
elif [ -f /etc/redhat-release ]; then
install -d ${etcdir}/init.d
- cp yaws.init.d ${etcdir}/init.d/yaws
+ sed -e "s;%prefix%;$p;g" yaws.init.d > ${etcdir}/init.d/yaws
chmod +x ${etcdir}/init.d/yaws
else
echo "Don't know how to make /etc/init scrips for this system"
View
@@ -20,7 +20,7 @@ clean:
rm -f ../bin/yaws
install: all
- sh ./Install $(INSTALLPREFIX) $(ERL) $(ETCDIR)
+ sh ./Install $(PREFIX) $(INSTALLPREFIX) $(ERL) $(ETCDIR)
@@ -7,7 +7,7 @@
YAWS_APP=yaws
# Path to yaws executable
-YAWS_EXEC=yaws
+YAWS_EXEC=%prefix%/bin/yaws
# NB: It is recomended that you don't run Yaws as root
YAWS_UID=root
View
@@ -13,17 +13,13 @@ DEPEND=">=dev-lang/erlang-r8
ssl? ( >=dev-libs/openssl-0.9.6d )"
- src_compile() {
- ./configure \
- --prefix=${D}/usr/ \
- --sysconfdir=${D}/etc/ \
- --localstatedir=${D}/var || die
-
+ src_compile() {
+ ./configure --prefix=/usr || die
make || die
}
src_install() {
- make install || die
+ make DESTDIR=${D} install || die
}
View
@@ -12,7 +12,7 @@
. /etc/rc.d/init.d/functions
-yaws=/usr/local/bin/yaws
+yaws=%prefix%bin/yaws
prog=yaws
start() {

0 comments on commit 3a3459c

Please sign in to comment.