From a3a28f9e5f28595a5c276f80ead6e215fe18374b Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sat, 14 Mar 2009 11:44:07 +0000 Subject: [PATCH] Minor fixes svn path=/trunk/netsurf/; revision=6781 --- amiga/dist/Install | 10 +++++----- amiga/pkg/makepackage | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/amiga/dist/Install b/amiga/dist/Install index a4edb881f..950d04f66 100755 --- a/amiga/dist/Install +++ b/amiga/dist/Install @@ -140,16 +140,16 @@ ) (set #cairo-version 1) (set #netsurf-exists (exists (tackon @default-dest "NetSurf"))) - (if (<> #netsurf-exists 0) - ( +; (if (<> #netsurf-exists 0) +; ( ; Guess if the installed version is static, if it ; is bigger than 9MB then it probably is! ; Comment this out temporarily as we want AutoInstall to update to the Cairo ; version at this stage, as it hasn't seen a snapshot release yet. ; (set #netsurf-size (getsize (tackon @default-dest "NetSurf"))) ; (if (> #netsurf-size 9000000) (set #cairo-version 0)) - ) - ) +; ) +; ) ) ; else ( @@ -247,7 +247,7 @@ ( (working "Copying Shared Objects") - (foreach "SObjs" "#?.so" + (foreach "SObjs" "#?" (complete #complete) (p_copysobj @each-name) (set #complete (+ #complete 5)) diff --git a/amiga/pkg/makepackage b/amiga/pkg/makepackage index 5a2e51c17..892363672 100755 --- a/amiga/pkg/makepackage +++ b/amiga/pkg/makepackage @@ -20,5 +20,5 @@ copy amiga/dist/~(.svn|AutoInstall) ram:NetSurf/ makedir ram:NetSurf/Rexx copy amiga/dist/Rexx/~(.svn) ram:NetSurf/Rexx/ COM makedir ram:NetSurf/SObjs -copy sobjs:libgcc.so sobjs:libc.so sobjs:libjpeg.so sobjs:libpthread.so sobjs:libexpat.so libhubbub.so libhpdf-2.2.0.so.0.0 libmng.so.1 ram:NetSurf/SObjs clone +copy sobjs:libgcc.so sobjs:libc.so sobjs:libjpeg.so sobjs:libpthread.so sobjs:libexpat.so sobjs:libhubbub.so sobjs:libhpdf-2.2.0.so.0.0 sobjs:libmng.so.1 sobjs:liblcms.so ram:NetSurf/SObjs clone ;sobjs:libcurl-7.16.so sobjs:libssl-0.9.8.so