aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2006-11-06 06:48:49 +0000
committerRoger Dingledine <arma@torproject.org>2006-11-06 06:48:49 +0000
commitf0a7d211f1f18169bcdcff7e2715e53778ba9b94 (patch)
treee19969821b43834360d563ef6071035e79c0332c
parent4a80643825c086c8bdd21033d6739ca95229de92 (diff)
downloadtor-f0a7d211f1f18169bcdcff7e2715e53778ba9b94.tar
tor-f0a7d211f1f18169bcdcff7e2715e53778ba9b94.tar.gz
back-pedal a bit
svn:r8913
-rw-r--r--contrib/Makefile.am2
-rw-r--r--contrib/tor.nsi.in5
2 files changed, 4 insertions, 3 deletions
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 2bd202f11..4d5ecda71 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -3,7 +3,7 @@ DIST_SUBDIRS = osx suse
confdir = $(sysconfdir)/tor
-EXTRA_DIST = exitlist tor-tsocks.conf torify.1 TorControl.py tor.sh torctl rc.subr ExerciseServer.py PathDemo.py cross.sh tor-mingw.nsi.in package_nsis-mingw.sh tor.ico
+EXTRA_DIST = exitlist tor-tsocks.conf torify.1 TorControl.py tor.nsi.in tor.sh torctl rc.subr ExerciseServer.py PathDemo.py cross.sh tor-mingw.nsi.in package_nsis-mingw.sh tor.ico
conf_DATA = tor-tsocks.conf
diff --git a/contrib/tor.nsi.in b/contrib/tor.nsi.in
index f1b62479f..67597dc55 100644
--- a/contrib/tor.nsi.in
+++ b/contrib/tor.nsi.in
@@ -2,7 +2,7 @@
; Originally written by J Doe.
; See LICENSE for licencing information
;-----------------------------------------
-; NOTE: This file is obsolete. Look at tor-mingw.nsi.in instead.
+; NOTE: This file might be obsolete. Look at tor-mingw.nsi.in instead.
;-----------------------------------------
; How to make an installer:
; Step 0. If you are a Tor maintainer, make sure that tor.nsi and
@@ -128,6 +128,7 @@ Section "Documents" Docs
File "..\doc\dir-spec.txt"
File "..\doc\rend-spec.txt"
File "..\doc\socks-extensions.txt"
+ File "..\doc\tor-spec.txt"
File "..\doc\version-spec.txt"
;
; WEBSITE-FILES-HERE
@@ -156,7 +157,7 @@ Section "Start Menu" StartMenu
CreateShortCut "$SMPROGRAMS\Tor\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
IfFileExists "$INSTDIR\Documents\*.*" "" endifdocs
CreateDirectory "$SMPROGRAMS\Tor\Documents"
- CreateShortCut "$SMPROGRAMS\Tor\Documents\Tor Manual.lnk" "$INSTDIR\Documents\tor-doc.html"
+ CreateShortCut "$SMPROGRAMS\Tor\Documents\Tor Manual.lnk" "$INSTDIR\Documents\tor-reference.html"
CreateShortCut "$SMPROGRAMS\Tor\Documents\Tor Documentation.lnk" "$INSTDIR\Documents"
CreateShortCut "$SMPROGRAMS\Tor\Documents\Tor Specification.lnk" "$INSTDIR\Documents\tor-spec.txt"
endifdocs: