From ad3af34742d25058e5f6a6a1e4de5fab429ef9a8 Mon Sep 17 00:00:00 2001
From: Chris Young <chris@unsatisfactorysoftware.co.uk>
Date: Mon, 26 Sep 2011 21:41:33 +0000
Subject: Build Cairo version as NetSurf; non-Cairo version as NetSurf-Static
 Don't bother to build/copy NetSurf-Static for release packages Update .readme
 to show requirement for AmigaOS 4.1

svn path=/trunk/netsurf/; revision=12893
---
 amiga/Makefile.target     | 4 ++--
 amiga/dist/Install        | 6 +++---
 amiga/dist/netsurf.readme | 2 +-
 amiga/pkg/makepackage     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/amiga/Makefile.target b/amiga/Makefile.target
index 52db664af..d80f91016 100644
--- a/amiga/Makefile.target
+++ b/amiga/Makefile.target
@@ -33,9 +33,9 @@ ifeq ($(HOST),amiga)
   ifeq ($(NETSURF_AMIGA_USE_CAIRO),YES)
     CFLAGS += -DNS_AMIGA_CAIRO -I /SDK/local/common/include/cairo
     LDFLAGS += -use-dynld -ldl -lcairo -lpixman-1 -lfreetype -lfontconfig -lpng -lexpat
-    EXETARGET := NetSurf-Cairo
-  else
     EXETARGET := NetSurf
+  else
+    EXETARGET := NetSurf-Static
   endif
 else
   $(eval $(call pkg_config_find_and_add,ROSPRITE,librosprite,Sprite))
diff --git a/amiga/dist/Install b/amiga/dist/Install
index 4d97a5e58..2d0a4d589 100755
--- a/amiga/dist/Install
+++ b/amiga/dist/Install
@@ -306,7 +306,7 @@
 (set osver (/ osver 65536))
 (set #versions-available 0)
 
-(if (exists "NetSurf")
+(if (exists "NetSurf-Static")
 	(
 		(set #static-name "Static/graphics.library")
 		(set #versions-available (+ #versions-available 1))
@@ -317,7 +317,7 @@
 	)
 )
 
-(if (AND (>= osver 53) (exists "NetSurf-Cairo"))
+(if (AND (>= osver 53) (exists "NetSurf"))
 	(
 		(set #cairo-name "Shared objects/part-Cairo")
 		(set #versions-available (+ #versions-available 1))
@@ -406,7 +406,7 @@
 
 (complete 20)
 
-(set #netsurf-name (select #cairo-version "NetSurf" "NetSurf-Cairo"))
+(set #netsurf-name (select #cairo-version "NetSurf-Static" "NetSurf"))
 
 (if (= #AutoInstall 0)
 	(
diff --git a/amiga/dist/netsurf.readme b/amiga/dist/netsurf.readme
index 0645ac9a5..391e7c3fd 100755
--- a/amiga/dist/netsurf.readme
+++ b/amiga/dist/netsurf.readme
@@ -3,7 +3,7 @@ Uploader:     chris@unsatisfactorysoftware.co.uk (Chris Young)
 Author:       NetSurf contributors (OS4 port by Chris Young)
 Type:         comm/www
 Version:      3.0 development (SVN 10866)
-Architecture: ppc-amigaos >= 4.0.0
+Architecture: ppc-amigaos >= 4.1.0
 
 Install manually with Installer script only -
 INTENTIONALLY NOT AVAILABLE VIA AMIUPDATE
diff --git a/amiga/pkg/makepackage b/amiga/pkg/makepackage
index 0c3350219..5db693b13 100755
--- a/amiga/pkg/makepackage
+++ b/amiga/pkg/makepackage
@@ -14,7 +14,7 @@ delete ram:netsurf/resources/#?.user
 copy resources/Pointers/~(.svn) ram:NetSurf/Resources/Pointers
 copy (COPYING|ChangeLog) ram:NetSurf/
 copy NetSurf ram:NetSurf/NetSurf
-copy NetSurf-Cairo ram:NetSurf/NetSurf-Cairo
+;copy NetSurf-Static ram:NetSurf/NetSurf-Cairo
 copy amiga/dist/AutoInstall ram:
 copy amiga/dist/~(.svn|AutoInstall) ram:NetSurf/
 copy amiga/pkg/drawer.info ram:NetSurf.info
-- 
cgit v1.2.3