Permalink
Browse files

Build and make fixes

git-svn-id: https://erlyaws.svn.sourceforge.net/svnroot/erlyaws/trunk/yaws@1124 9fbdc01b-0d2c-0410-bfb7-fb27d70d8b52
  • Loading branch information...
1 parent e441faa commit 443b55e425eef0db9e46eb21aac5703bd7d15328 @klacke committed Aug 16, 2007
Showing with 10 additions and 6 deletions.
  1. +4 −4 c_src/Makefile
  2. +1 −1 doc/Makefile
  3. +1 −1 scripts/Install
  4. +2 −0 scripts/Makefile
  5. +1 −0 scripts/yaws.conf.template
  6. +1 −0 src/yaws_generated.template
View
8 c_src/Makefile
@@ -9,7 +9,7 @@ ifdef WIN32
PRIV_FILES=../priv/.foo
else
# don't make pam if configured out with --disable-pam
- PRIV_FILES= ../priv/setuid_drv.$(DLL) $(EPAM)
+ PRIV_FILES= ../priv/lib/setuid_drv.$(DLL) $(EPAM)
endif
@@ -28,8 +28,8 @@ clean:
-rm -f $(PRIV_FILES) setuid_drv.$(OBJ)
install: $(PRIV_FILES)
- $(INSTALL) -d $(DESTDIR)$(PREFIX)/lib/yaws/priv
- $(INSTALL) $(PRIV_FILES) $(DESTDIR)$(PREFIX)/lib/yaws/priv
+ $(INSTALL) -d $(DESTDIR)$(PREFIX)/lib/yaws/priv/lib
+ $(INSTALL) $(PRIV_FILES) $(DESTDIR)$(PREFIX)/lib/yaws/priv/lib
ifndef WIN32
if [ `id -u` = "0" -a -d $(DESTDIR)$(PREFIX)/lib/yaws/priv/epam ]; then \
chown root $(DESTDIR)$(PREFIX)/lib/yaws/priv/epam; \
@@ -38,7 +38,7 @@ ifndef WIN32
endif
-../priv/setuid_drv.$(DLL): setuid_drv.$(OBJ)
+../priv/lib/setuid_drv.$(DLL): setuid_drv.$(OBJ)
$(LD_SHARED) $(OUT) $@ setuid_drv.$(OBJ) $(DLL_LIBS)
setuid_drv.$(OBJ): setuid_drv.c
$(CC) -c $(FPIC) $(CFLAGS) -DDYNAMIC_DRIVER setuid_drv.c
View
2 doc/Makefile
@@ -26,7 +26,7 @@ yaws.dvi: yaws.tex $(IMG_EPS)
-epstopdf $<
clean:
- -rm *~ *.ps *.dvi *.log *.aux *.pdf *.toc *.beam 2> /dev/null
+ rm -f *.ps *.dvi *.log *.aux *.pdf *.toc *.beam 2> /dev/null || true
install:
-install -d $(DESTDIR)/$(PREFIX)/share/doc/yaws-$(YAWS_VSN)
View
2 scripts/Install
@@ -1,6 +1,6 @@
#!/bin/sh
-set -x
+#set -x
prefix=$1
destdir=$2
View
2 scripts/Makefile
@@ -35,11 +35,13 @@ local_install: ../bin/yaws
cp -f ../bin/yaws $$HOME/bin/yaws; \
echo "--- Installed $$HOME/bin/yaws"
+
yaws.conf:
@echo PREFIX is $(PREFIX)
cat yaws.conf.template | \
./Subst %yawsdir% $(PREFIX)/lib/yaws | \
./Subst %logdir% $(VARDIR)/log/yaws | \
+ ./Subst %vardir% $(VARDIR) | \
./Subst %host% `hostname` | \
./Subst %port% 80 | \
./Subst %docroot% $(VARDIR)/yaws/www | \
View
1 scripts/yaws.conf.template
@@ -16,6 +16,7 @@ logdir = %logdir%
# directory to its search path
ebin_dir = %yawsdir%/examples/ebin
+ebin_dir = %vardir%/yaws/ebin
# This is a directory where application specific .hrl
View
1 src/yaws_generated.template
@@ -22,3 +22,4 @@ ctldir() -> "%VARDIR%/run/yaws".
etcdir() -> "%ETCDIR%".
+

0 comments on commit 443b55e

Please sign in to comment.