debian/rules @@ -2,8 +2,8 @@ PREFIX = @prefix@ -ETCDIR = $(DESTDIR)@sysconfdir@ -VARDIR = $(DESTDIR)@localstatedir@ +ETCDIR = $(DESTDIR)/etc +VARDIR = $(DESTDIR)/var INSTALLPREFIX = $(DESTDIR)$(PREFIX) ERL=@ERL@ include.mk.in @@ -19,30 +19,9 @@ cat yaws.template | \ chmod +x ${installprefix}/bin/yaws - - - install -d ${installprefix}/lib/yaws/examples/ebin install -d ${installprefix}/lib/yaws/examples/include -if [ -f ${etcdir}/yaws.conf ]; then - target=${etcdir}/yaws.conf.template -else - target=${etcdir}/yaws.conf -fi -echo "--- Writing config file to ${target}" - - -cat yaws.conf.template | \ - ./Subst %yawsdir% ${prefix}/lib/yaws | \ - ./Subst %logdir% /var/log/yaws | \ - ./Subst %host% `hostname` | \ - ./Subst %port% 80 | \ - ./Subst %docroot% ${vardir}/yaws/www | \ - ./Subst %certdir% ${etcdir} | \ - ./Subst %sslport% 443 > ${target} - - if [ -f /etc/gentoo-release ]; then install -d ${etcdir}/init.d/ install -d ${etcdir}/conf.d/ scripts/Install @@ -1,7 +1,7 @@ include ../include.mk -all debug: ../bin/yaws +all debug: ../bin/yaws yaws.conf ../bin/yaws: yaws.template cat yaws.template | \ @@ -31,16 +31,17 @@ local_install: ../bin/yaws cp ../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% /var/log/yaws | ./Subst %host% `hostname` | ./Subst %port% 80 | ./Subst %docroot% $(VARDIR)/yaws/www | ./Subst %certdir% $(ETCDIR) | ./Subst %sslport% 443 > yaws.conf + clean: rm -f ../bin/yaws install: -rm -rf /tmp/yaws 2> /dev/null sh ./Install $(PREFIX) $(INSTALLPREFIX) "$(ERL)" \ - "$(WERL)" $(ETCDIR) $(VARDIR) + "$(WERL)" /etc/ /var/ @cp ../ssl/yaws-cert.pem $(ETCDIR) @cp ../ssl/yaws-key.pem $(ETCDIR) - - - - + cp yaws.conf $(prefix)/etc/ \ No newline at end of file scripts/Makefile @@ -64,12 +64,15 @@ install: all docsinstall install -d $(INSTALLPREFIX)/lib/yaws/ebin install -d $(VARDIR)/log/yaws install -d $(VARDIR)/yaws/ebin - (cd ..; tar cf - ebin ) | (cd $(INSTALLPREFIX)/lib/yaws; tar xf - ) - (cd ..; tar cf - include ) | (cd $(INSTALLPREFIX)/lib/yaws; tar xf - ) + cp -r ../ebin/* $(INSTALLPREFIX)/lib/yaws/ + cp -r ../include/* $(INSTALLPREFIX)/lib/yaws/ +# (cd ..; tar cf - ebin ) | (cd $(INSTALLPREFIX)/lib/yaws; tar xf - ) +# (cd ..; tar cf - include ) | (cd $(INSTALLPREFIX)/lib/yaws; tar xf - ) docsinstall: install -d $(VARDIR)/yaws/www - (cd ..; tar cf - www ) | (cd $(VARDIR)/yaws; tar xf - ) + cp -r ../www/* $(VARDIR)/yaws + #(cd ..; tar cf - www ) | (cd $(VARDIR)/yaws; tar xf - ) src/Makefile scripts/yaws.conf b8795d6e42197df608213201e1f656928d324ec9 Claes Wikstrom klacke@hyber.org http://github.com/klacke/yaws/commit/5d32ac8683e587d1c190721b3ec10d0985e947df 5d32ac8683e587d1c190721b3ec10d0985e947df 2004-05-24T06:37:04-07:00 2004-05-24T06:37:04-07:00 debian patch from David Welton applied git-svn-id: https://erlyaws.svn.sourceforge.net/svnroot/erlyaws/trunk/yaws@685 9fbdc01b-0d2c-0410-bfb7-fb27d70d8b52 e2309e718604e3d657c73302b7ef09353cd16091 Claes Wikstrom klacke@hyber.org