From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 21 Apr 2011 18:04:45 +0000 (+0100)
Subject: ipif: fix for make breakage
X-Git-Tag: userv/0.6.1~78^2~4
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv-utils.git;a=commitdiff_plain;h=81007d45611a61af0bdb41209a15f8646027e3dc

ipif: fix for make breakage
---

diff --git a/ipif/Makefile b/ipif/Makefile
index ce3f440..7791058 100644
--- a/ipif/Makefile
+++ b/ipif/Makefile
@@ -53,13 +53,12 @@ install-examples:
 		cp *.example $(etcvpn)/.
 
 udptunnel-reconf:	udptunnel-reconf.pl Makefile
-		perl -pe '	\
-	print "\
-\$$shareuserv= \"$(shareuserv)\";\n\
-\$$etcvpn= \"$(etcvpn)\";\n\
-\$$varlibvpn= \"$(varlibvpn)\";\n" if m#^\# \@\@\@\-#;	\
-	$$_="" if m/^\# \@\@\@\-/ .. m/^\# \-\@\@\@/;	\
-		'	\
+		set -x; 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 $@