Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/disorder

[disorder] / scripts / sedfiles.make

diff --git a/scripts/sedfiles.make b/scripts/sedfiles.make
index cbae8c148a7725ec2b1052ba22eb0ec781ba7171..fcf3bb876da041605b797ea6fc99d7dc7272893f 100644 (file)
--- a/scripts/sedfiles.make
+++ b/scripts/sedfiles.make
@@ -2,29 +2,31 @@
 # 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/>.
 #
 
 $(SEDFILES) : % : %.in Makefile
        rm -f $@.new
        $(GNUSED) -e 's!sbindir!${sbindir}!g;' \
            -e 's!bindir!${bindir}!g;' \
+           -e 's!sysconfdir!${sysconfdir}!g;' \
            -e 's!pkgconfdir!${sysconfdir}/disorder!g;' \
            -e 's!pkgstatedir!${localstatedir}/disorder!g;' \
            -e 's!pkgdatadir!${pkgdatadir}!g;' \
+           -e 's!dochtmldir!${dochtmldir}!g;' \
+           -e 's!cgiexecdir!${cgiexecdir}!g;' \
+           -e 's!SENDMAIL!${SENDMAIL}!g;' \
            -e 's!_version_!${VERSION}!g;' \
                < $< > $@.new
        @if test -x $<; then \