Permalink
Browse files

Make/build fixes

git-svn-id: https://erlyaws.svn.sourceforge.net/svnroot/erlyaws/trunk/yaws@1043 9fbdc01b-0d2c-0410-bfb7-fb27d70d8b52
  • Loading branch information...
1 parent 26b5347 commit 9605d55445ed3ac14121cb1e1898ad8ee07993b5 @klacke committed Dec 10, 2006
Showing with 10 additions and 9 deletions.
  1. +2 −1 scripts/Install
  2. +1 −0 scripts/Makefile
  3. +1 −1 scripts/make-upload
  4. +6 −7 src/Makefile
View
@@ -19,6 +19,7 @@ e=${etcdir}
v=${vardir}
install -d ${destdir}/${prefix}/bin
+install -d ${destdir}/${prefix}/etc
cat yaws.template | \
./Subst %yawsdir% ${prefix}/lib/yaws | \
@@ -62,7 +63,7 @@ elif [ -f /etc/debian_version ]; then
elif [ "`uname -s`" = "Darwin" -a `id -u` = 0 ]; then
startupdir="/Library/StartupItems/Yaws"
- if [ ! -e ${startupdir} && ]; then
+ if [ ! -e ${startupdir} ]; then
mkdir ${startupdir};
elif [ ! -d ${startupdir} ]; then
echo "${startupdir} exists but is not a directory, bailing out ..."
View
@@ -61,5 +61,6 @@ install: .install
cp yaws.conf $(DESTDIR)/$(ETCDIR)/yaws.conf.template; \
else \
echo "Installing $(DESTDIR)/$(ETCDIR)/yaws.conf"; \
+ mkdir -p $(DESTDIR)/$(ETCDIR); \
cp yaws.conf $(DESTDIR)/$(ETCDIR)/yaws.conf; \
fi
View
@@ -14,7 +14,7 @@ echo "cd incoming " > /tmp/cmds.$$
echo "put $1 " >> /tmp/cmds.$$
ncftp -u anonymous -p klacke@hyber.org upload.sourceforge.net < /tmp/cmds.$$
rm /tmp/cmds.$$
-#scp $1 klacke@gnejs.hyber.org:/var/yaws/www/download
+
echo "Now login at sourceforge at go the page"
View
@@ -76,17 +76,16 @@ clean:
rm -f $(EBIN_FILES) yaws_generated.erl charset.def mime_types.erl
install: all docsinstall
- install -d $(DESTDIR)/$(PREFIX)/lib/yaws/examples/ebin
- install -d $(DESTDIR)/$(PREFIX)/lib/yaws/examples/include
- install -d $(DESTDIR)/$(PREFIX)/lib/yaws/ebin
- install -d $(DESTDIR)/$(VARDIR)/log/yaws
- install -d $(DESTDIR)/$(VARDIR)/yaws/ebin
-# cp -r ../include/* $(DESTDIR)/$(PREFIX)/lib/yaws/
+ $(INSTALL) -d $(DESTDIR)/$(PREFIX)/lib/yaws/examples/ebin
+ $(INSTALL) -d $(DESTDIR)/$(PREFIX)/lib/yaws/examples/include
+ $(INSTALL) -d $(DESTDIR)/$(PREFIX)/lib/yaws/ebin
+ $(INSTALL) -d $(DESTDIR)/$(VARDIR)/log/yaws
+ $(INSTALL) -d $(DESTDIR)/$(VARDIR)/yaws/ebin
(cd ..; tar cf - ebin ) | (cd $(DESTDIR)/$(PREFIX)/lib/yaws; tar xf - )
(cd ..; tar cf - include ) | (cd $(DESTDIR)/$(PREFIX)/lib/yaws; tar xf - )
docsinstall:
- install -d $(DESTDIR)/$(VARDIR)/yaws/www
+ $(INSTALL) -d $(DESTDIR)/$(VARDIR)/yaws/www
(cd ..; tar cf - www ) | (cd $(DESTDIR)/$(VARDIR)/yaws; tar xf - )

0 comments on commit 9605d55

Please sign in to comment.