diff -r f98f716b2ae8 -r 3a28047ec6dc Makefile --- a/Makefile Wed Dec 02 17:46:28 2009 +0000 +++ b/Makefile Wed Dec 02 17:48:40 2009 +0000 @@ -5,6 +5,7 @@ DOCDIR=$(PREFIX)/doc/mercurial-server ETCDIR=/etc/mercurial-server NEWUSER=hg +DOCBOOK_XSL=/usr/share/xml/docbook/stylesheet/nwalsh INSTALL=install @@ -18,7 +19,11 @@ installetc: $(INSTALL) -d $(DESTDIR)$(ETCDIR) $(INSTALL) -m 644 -t $(DESTDIR)$(ETCDIR) \ - src/init/conf/remote-hgrc src/init/conf/access.conf + src/init/conf/access.conf + $(INSTALL) -d $(DESTDIR)$(ETCDIR)/remote-hgrc.d + $(INSTALL) -m 644 -t $(DESTDIR)$(ETCDIR)/remote-hgrc.d \ + src/init/conf/remote-hgrc.d/access.rc \ + src/init/conf/remote-hgrc.d/logging.rc $(INSTALL) -d $(DESTDIR)$(ETCDIR)/keys/root $(INSTALL) -d $(DESTDIR)$(ETCDIR)/keys/users @@ -29,11 +34,11 @@ $(INSTALL) -m 644 -t $(DESTDIR)$(DOCDIR)/html build/html/index.html build/html/index.html: doc/manual.docbook - xsltproc --nonet -o $@ /usr/share/xml/docbook/stylesheet/nwalsh/html/docbook.xsl $^ + xsltproc --nonet -o $@ $(DOCBOOK_XSL)/html/docbook.xsl $^ build/pdf/manual.pdf: doc/manual.docbook mkdir -p build/pdf - fop -xml $^ -xsl /usr/share/xml/docbook/stylesheet/nwalsh/fo/docbook.xsl $@ + fop -xml $^ -xsl $(DOCBOOK_XSL)/fo/docbook.xsl $@ pythonbuild: python setup.py build