Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

weird make behaviour from macos make

git-svn-id: https://erlyaws.svn.sourceforge.net/svnroot/erlyaws/trunk/yaws@977 9fbdc01b-0d2c-0410-bfb7-fb27d70d8b52
  • Loading branch information...
commit 0e4eef7822c6a04914304cb99a8e0330e5b52565 1 parent 27ce7bf
@klacke authored
Showing with 5 additions and 3 deletions.
  1. +2 −2 scripts/Install
  2. +3 −1 scripts/Makefile
View
4 scripts/Install
@@ -53,9 +53,9 @@ elif [ -f /etc/suseservers ]; then
chmod +x ${destdir}/${etcdir}/init.d/yaws
install -d ${destdir}/${vardir}/run/yaws
chmod a+rwx ${destdir}/${vardir}/run/yaws
-elif [ "`uname -s`" = "Darwin" ]; then
+elif [ "`uname -s`" = "Darwin" && `id -u` = 0 ]; then
startupdir="/Library/StartupItems/Yaws"
- if [ ! -d ${startupdir} ]; then
+ if [ ! -d ${startupdir} && ]; then
mkdir ${startupdir};
fi
sed -e "s;%prefix%;$p;g" darwin/Yaws.StartupItem > ${startupdir}/Yaws
View
4 scripts/Makefile
@@ -48,7 +48,9 @@ yaws.conf:
clean:
rm -f ../bin/yaws
-install:
+install: .install
+
+.install:
-rm -rf /tmp/yaws 2> /dev/null
sh ./Install $(PREFIX) $(DESTDIR) "$(ERL)" \
"$(WERL)" $(ETCDIR)/ $(VARDIR)/ $(ERLBINDIR)/
Please sign in to comment.
Something went wrong with that request. Please try again.