Update to GPLv3+; update copyright notices everywhere.

[userv-utils] / ipif / Makefile

diff --git a/ipif/Makefile b/ipif/Makefile
index 7791058..5136656 100644 (file)
--- a/ipif/Makefile
+++ b/ipif/Makefile
@@ -1,11 +1,16 @@
 # Makefile for ipif/udptunnel stuff
 
-# Copyright (C) 1999-2000,2003 Ian Jackson
-# This file is part of ipif, part of userv-utils
+# This file is part of ipif, part of userv-util
+#
+# Copyright 1996-2013 Ian Jackson <ijackson@chiark.greenend.org.uk>
+# Copyright 1998 David Damerell <damerell@chiark.greenend.org.uk>
+# Copyright 1999,2003
+#    Chancellor Masters and Scholars of the University of Cambridge
+# Copyright 2010 Tony Finch <fanf@dotat.at>
 #
 # This 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
@@ -14,10 +19,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with userv-utils; if not, write to the Free Software
-# Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# $Id$
+# along with userv-utils; if not, see http://www.gnu.org/licenses/.
 
 include ../settings.make
 
@@ -53,12 +55,12 @@ install-examples:
                cp *.example $(etcvpn)/.
 
 udptunnel-reconf:      udptunnel-reconf.pl Makefile
-               set -x; perl -p \
--e '           print ' \
--e '   "\$$shareuserv= \"$(shareuserv)\";\n".' \
--e '   "\$$etcvpn= \"$(etcvpn)\";\n".' \
--e '   "\$$varlibvpn= \"$(varlibvpn)\";\n" if m#^\# \@\@\@\-#; ' \
--e '           $$_="" if m/^\# \@\@\@\-/ .. m/^\# \-\@\@\@/;   ' \
+               perl -p                                                   \
+       -e '    print "                                                 ' \
+       -e '\$$shareuserv= \"$(shareuserv)\";\n                         ' \
+       -e '\$$etcvpn= \"$(etcvpn)\";\n                                 ' \
+       -e '\$$varlibvpn= \"$(varlibvpn)\";\n" if m#^\# \@\@\@\-#;      ' \
+       -e '    $$_="" if m/^\# \@\@\@\-/ .. m/^\# \-\@\@\@/;           ' \
                        <$< >$@.new
                chmod +x $@.new
                mv -f $@.new $@