From 0a75fd2faaa65e59303c47f05e29330295e979af Mon Sep 17 00:00:00 2001 From: Andrew Lewman Date: Fri, 14 Dec 2007 05:20:38 +0000 Subject: update postflight to put the man page in the right place on osx. clarify license in the mingw.nsi and some minor touch ups. svn:r12806 --- contrib/polipo/PolipoPostflight | 3 +-- contrib/polipo/polipo-mingw.nsi | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'contrib') diff --git a/contrib/polipo/PolipoPostflight b/contrib/polipo/PolipoPostflight index 4c24c5eb37..a0510bdbd6 100644 --- a/contrib/polipo/PolipoPostflight +++ b/contrib/polipo/PolipoPostflight @@ -42,8 +42,7 @@ if [ ! -f $TARGET/config]; then fi cd /usr/share/man/man1 -MAN1=$TARGET/man/man1 -ln -sf $MAN1/*.1 . +MAN1=$TARGET/share/man/man1 if [ -d /Library/StartupItems/Polipo ]; then find /Library/StartupItems/Polipo -print0 | xargs -0 chown root:wheel diff --git a/contrib/polipo/polipo-mingw.nsi b/contrib/polipo/polipo-mingw.nsi index 89a65cf409..8e4f76b06d 100644 --- a/contrib/polipo/polipo-mingw.nsi +++ b/contrib/polipo/polipo-mingw.nsi @@ -1,20 +1,20 @@ ;polipo-mingw.nsi - A basic win32 installer for Polipo ; Originally written by J Doe. ; Modified by Andrew Lewman -; See LICENSE for licencing information +; See the Tor LICENSE for licencing information ;----------------------------------------- ; !include "MUI.nsh" -!define VERSION "1.0.3.20070922-darcs" +!define VERSION "1.0.3" !define INSTALLER "polipo-${VERSION}-win32.exe" !define WEBSITE "http://www.pps.jussieu.fr/~jch/software/polipo/" !define LICENSE "COPYING" -;BIN is where it expects to find polipo.exe -!define BIN "." +!define BIN "." ;BIN is where it expects to find polipo.exe -SetCompressor lzma +SetCompressor /SOLID LZMA ;Tighter compression +RequestExecutionLevel user ;Updated for Vista compatibility OutFile ${INSTALLER} InstallDir $PROGRAMFILES\Polipo SetOverWrite ifnewer @@ -32,7 +32,7 @@ VIAddVersionKey "LegalCopyright" " VIAddVersionKey "FileDescription" "Polipo is a caching web proxy." VIAddVersionKey "FileVersion" "${VERSION}" -!define MUI_WELCOMEPAGE_TITLE "Welcome to the Polipo ${VERSION} Setup Wizard" +!define MUI_WELCOMEPAGE_TITLE "Welcome to the Polipo Setup Wizard" !define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of Polipo ${VERSION}.\r\n\r\nIf you have previously installed Polipo and it is currently running, please exit Polipo first before continuing this installation.\r\n\r\n$_CLICK" !define MUI_ABORTWARNING !define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico" -- cgit v1.2.3-54-g00ecf