[or-cvs] Remove @LOCALSTATEDIR@ macros when building windows package

[nickm@xxxxxxxx (Nick Mathewson)]

Update of /home/or/cvsroot/tor/contrib
In directory moria.mit.edu:/tmp/cvs-serv12300/contrib

Modified Files:
	package_nsis.sh 
Log Message:
Remove @LOCALSTATEDIR@ macros when building windows package

Index: package_nsis.sh
===================================================================
RCS file: /home/or/cvsroot/tor/contrib/package_nsis.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- package_nsis.sh	19 Mar 2005 05:07:19 -0000	1.4
+++ package_nsis.sh	23 Mar 2005 21:28:37 -0000	1.5
@@ -24,7 +24,11 @@
 man2html doc/tor-resolve.1 > win_tmp/tmp/tor-resolve.html
 
 clean_newlines() {
-    perl -pe 'BEGIN {undef $;} s/^\n$/\r\n/mg; s/([^\r])\n$/\1\r\n/mg;' $1 >$2
+    perl -pe 'BEGIN {undef $/;} s/^\n$/\r\n/mg; s/([^\r])\n$/\1\r\n/mg;' $1 >$2
+}
+
+clean_localstatedir() {
+    perl -pe 'BEGIN {undef $/;} s/^\n$/\r\n/mg; s/([^\r])\n$/\1\r\n/mg; s{\@LOCALSTATEDIR\@/(lib|log)/tor/}{\\Application Data\\Tor\\}' $1 >$2
 }
 
 for fn in CLIENTS tor-spec.txt HACKING rend-spec.txt control-spec.txt \
@@ -42,7 +46,7 @@
     clean_newlines $fn win_tmp/$fn
 done
 
-clean_newlines src/config/torrc.sample.in win_tmp/src/config/torrc.sample
+clean_localstatedir src/config/torrc.sample.in win_tmp/src/config/torrc.sample
 
 cp contrib/tor.nsi win_tmp/contrib