Play nicely with Autoconf 2.68

[disorder] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 87a70c080be3d1da831fb96eb352ef608d3e0927..5599ffd00a188df4bdb85f02d726356cead0573e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,30 +2,32 @@
 # 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/>.
 #
 
-EXTRA_DIST=TODO CHANGES README.streams BUGS \
+EXTRA_DIST=CHANGES.html README.streams BUGS \
 README.upgrades README.client README.raw README.vhost README.developers
 SUBDIRS=@subdirs@
 
+DISTCHECK_CONFIGURE_FLAGS:=httpdir=$(distdir)/_inst/httpdir cgiexecdir=$(shell pwd)/$(distdir)/_inst/cgiexecdir
+
+ACLOCAL_AMFLAGS=-I m4
+
 check-report: before-check check make-coverage-reports
 before-check:
        rm -f */*.gcda */*.gcov
-make-coverage-reports:
+make-coverage-reports: check
        @for subdir in lib plugins server clients disobedience; do \
          echo cd $$subdir;\
          cd $$subdir;\
@@ -35,8 +37,18 @@ make-coverage-reports:
          cd ..;\
        done
 
+clean-gcov:
+       rm -f */index.html
+       rm -f */*.c.html
+       rm -f */*.gcov
+
 echo-distdir:
        @echo $(distdir)
 
 echo-version:
        @echo $(VERSION)
+
+uninstall-local:
+       rmdir ${DESTDIR}${pkgdatadir} || true
+       rmdir ${DESTDIR}${pkghttpdir} || true
+       rmdir ${DESTDIR}${pkglibdir} || true