X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/7f824aad72d99e320abc9aee722242c693c07579..86214c4a61b9ab346d7c4b6a12c9825a13caf921:/doc/Makefile.am?ds=sidebyside

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 27f3639..4989437 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,20 +2,18 @@
 # This file is part of DisOrder.
 # 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/>.
 #
 
 noinst_DATA=$(HTMLMAN)
@@ -27,7 +25,6 @@ man_MANS=disorderd.8 disorder.1 disorder.3 disorder_config.5 disorder-dump.8 \
 	disorder-stats.8 disorder-dbupgrade.8 disorder_templates.5 \
 	disorder_actions.5 disorder_options.5 disorder.cgi.8 \
 	disorder_preferences.5
-noinst_MANS=tkdisorder.1
 
 SEDFILES=disorder.1 disorderd.8 disorder_config.5 \
 	disorder-dump.8 disorder_protocol.5 disorder-deadlock.8 \
@@ -85,7 +82,7 @@ endif
 
 EXTRA_DIST=disorderd.8.in disorder.1.in disorder_config.5.in \
 	   disorder.3 disorder-dump.8.in disorder_protocol.5.in \
-	   tkdisorder.1 disorder-deadlock.8.in disorder-rescan.8.in \
+	   disorder-deadlock.8.in disorder-rescan.8.in \
 	   disobedience.1.in disorderfm.1.in disorder-speaker.8 \
 	   disorder-playrtp.1.in disorder-decode.8.in disorder-normalize.8 \
 	   disorder-stats.8.in disorder-dbupgrade.8.in \