# HG changeset patch
# User Paul Crowley <paul@lshift.net>
# Date 1257950490 0
# Node ID d46ef29ab17abdd61fd106ae7f0d79e0986189c4
# Parent  2b31cfd3d675b36fe0496d1e8e34a5bc8e77a100# Parent  d27b41424efb66563a70cc38fc6c65c1745a985b
Merge in makefile changes, update to DESTDIR

diff -r 2b31cfd3d675 -r d46ef29ab17a .hgtags
--- a/.hgtags	Wed Nov 11 08:36:24 2009 +0000
+++ b/.hgtags	Wed Nov 11 14:41:30 2009 +0000
@@ -2,4 +2,5 @@
 975fb921c3f3ffe7ccde5877f2954a5d1141bb14 release_0.6
 243dd21d0dbc140957afbe7c9e2afb9caaffee37 release_0.7
 95c9ab8e4bfc6fea6460b3147c3097373eba5d42 debian_0.7
+1ad9d5841a48a77f68dc5350bd1f941327a6348a release_0.8
 1e4050abb96e72c6324b93709e56a3e135e63ce1 debian_0.8-1
diff -r 2b31cfd3d675 -r d46ef29ab17a Makefile
--- a/Makefile	Wed Nov 11 08:36:24 2009 +0000
+++ b/Makefile	Wed Nov 11 14:41:30 2009 +0000
@@ -1,10 +1,9 @@
 #!/usr/bin/env make -f
 
-TOPDIR=
-PREFIX=$(TOPDIR)/usr/local/share
+PREFIX=/usr/local/share
 LIBDIR=$(PREFIX)/mercurial-server
 DOCDIR=$(PREFIX)/doc/mercurial-server
-ETCDIR=$(TOPDIR)/etc/mercurial-server
+ETCDIR=/etc/mercurial-server
 NEWUSER=hg
 
 INSTALL=install
@@ -17,20 +16,20 @@
 setup-useradd: installfiles useradd inituser
 
 installetc:
-	$(INSTALL) -d $(ETCDIR)
-	$(INSTALL) -m 644 -t $(ETCDIR) \
+	$(INSTALL) -d $(DESTDIR)$(ETCDIR)
+	$(INSTALL) -m 644 -t $(DESTDIR)$(ETCDIR) \
 	    src/init/conf/remote-hgrc src/init/conf/access.conf
-	$(INSTALL) -d $(ETCDIR)/keys/root
-	$(INSTALL) -d $(ETCDIR)/keys/users
+	$(INSTALL) -d $(DESTDIR)$(ETCDIR)/keys/root
+	$(INSTALL) -d $(DESTDIR)$(ETCDIR)/keys/users
 
 installdoc: build/html/index.html
-	$(INSTALL) -d $(DOCDIR)
-	$(INSTALL) -m 644 -t $(DOCDIR) README 
-	$(INSTALL) -d $(DOCDIR)/html
-	$(INSTALL) -m 644 -t $(DOCDIR)/html build/html/index.html
+	$(INSTALL) -d $(DESTDIR)$(DOCDIR)
+	$(INSTALL) -m 644 -t $(DESTDIR)$(DOCDIR) README 
+	$(INSTALL) -d $(DESTDIR)$(DOCDIR)/html
+	$(INSTALL) -m 644 -t $(DESTDIR)$(DOCDIR)/html build/html/index.html
 
 build/html/index.html: doc/manual.docbook
-	xsltproc -o $@ /usr/share/xml/docbook/stylesheet/nwalsh/html/docbook.xsl $^
+	xsltproc --nonet -o $@ /usr/share/xml/docbook/stylesheet/nwalsh/html/docbook.xsl $^
 
 build/pdf/manual.pdf: doc/manual.docbook
 	mkdir -p build/pdf
@@ -41,10 +40,10 @@
 
 pythoninstall:
 	python setup.py install \
-	    --install-purelib=$(LIBDIR) \
-	    --install-platlib=$(LIBDIR) \
-	    --install-scripts=$(LIBDIR) \
-	    --install-data=$(LIBDIR)
+	    --install-purelib=$(DESTDIR)$(LIBDIR) \
+	    --install-platlib=$(DESTDIR)$(LIBDIR) \
+	    --install-scripts=$(DESTDIR)$(LIBDIR) \
+	    --install-data=$(DESTDIR)$(LIBDIR)
 
 installfiles: installetc installdoc pythoninstall 
 
@@ -60,5 +59,5 @@
 	    --comment  "Mercurial repositories" $(NEWUSER)
 
 inituser:
-	su -l -c "$(LIBDIR)/init/hginit $(LIBDIR)" $(NEWUSER)
+	su -l -c "$(DESTDIR)$(LIBDIR)/init/hginit $(DESTDIR)$(LIBDIR)" $(NEWUSER)
 
diff -r 2b31cfd3d675 -r d46ef29ab17a debian/rules
--- a/debian/rules	Wed Nov 11 08:36:24 2009 +0000
+++ b/debian/rules	Wed Nov 11 14:41:30 2009 +0000
@@ -4,8 +4,8 @@
 
 override_dh_auto_install:
 	$(MAKE) installfiles \
-	    TOPDIR=debian/mercurial-server \
-	    PREFIX=debian/mercurial-server/usr/share
+	    DESTDIR=./debian/mercurial-server/ \
+	    PREFIX=/usr/share
 
 override_dh_pysupport:
 	dh_pysupport /usr/share/mercurial-server/mercurialserver