X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/65f5780f8a94f2bad8146b6e85b8085efdf06feb..e7eb3a2744aa45179daea235800753d3d1955338:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b8318a4..b0c39e9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,27 +1,28 @@
 #
 # This file is part of DisOrder.
-# Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell
+# Copyright (C) 2004-2008 Richard Kettlewell
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 #
 
-EXTRA_DIST=TODO CHANGES README.streams BUGS ChangeLog.d	\
-README.upgrades README.client README.mac README.raw
+EXTRA_DIST=TODO CHANGES.html README.streams BUGS \
+README.upgrades README.client README.raw README.vhost README.developers
 SUBDIRS=@subdirs@
 
+DISTCHECK_CONFIGURE_FLAGS=httpdir=$(distdir)/_inst/httpdir
+
 check-report: before-check check make-coverage-reports
 before-check:
 	rm -f */*.gcda */*.gcov
@@ -35,11 +36,13 @@ make-coverage-reports:
 	  cd ..;\
 	done
 
-dist-hook:
-	bzr log > ${distdir}/ChangeLog.d/bzr-changelog
-
 echo-distdir:
 	@echo $(distdir)
 
 echo-version:
 	@echo $(VERSION)
+
+uninstall-local:
+	rmdir ${DESTDIR}${pkgdatadir} || true
+	rmdir ${DESTDIR}${pkghttpdir} || true
+	rmdir ${DESTDIR}${pkglibdir} || true