From: Reto Buerki <reet@codelabs.ch>
Date: Fri, 22 Mar 2013 09:35:48 +0000 (+0100)
Subject: Fixed TKM build
X-Git-Tag: 5.0.3rc1~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3db17b0ccc80b8de9e170f41ba53c96a8ad5fd6a;p=thirdparty%2Fstrongswan.git

Fixed TKM build
---

diff --git a/testing/scripts/recipes/005_anet.mk b/testing/scripts/recipes/005_anet.mk
index 1ecb7b2941..3b8e6fd2ee 100644
--- a/testing/scripts/recipes/005_anet.mk
+++ b/testing/scripts/recipes/005_anet.mk
@@ -4,6 +4,8 @@ PKG = anet
 SRC = http://git.codelabs.ch/git/$(PKG).git
 REV = v0.2.2
 
+PREFIX = /usr/local/ada
+
 all: install
 
 .$(PKG)-cloned:
@@ -16,4 +18,4 @@ all: install
 	@touch $@
 
 install: .$(PKG)-built
-	cd $(PKG) && make LIBRARY_KIND=static install
+	cd $(PKG) && make PREFIX=$(PREFIX) LIBRARY_KIND=static install
diff --git a/testing/scripts/recipes/006_tkm-rpc.mk b/testing/scripts/recipes/006_tkm-rpc.mk
index 571d590d16..dc6847ca5e 100644
--- a/testing/scripts/recipes/006_tkm-rpc.mk
+++ b/testing/scripts/recipes/006_tkm-rpc.mk
@@ -4,7 +4,9 @@ PKG = tkm-rpc
 SRC = http://git.codelabs.ch/git/$(PKG).git
 REV = v0.1
 
-export ADA_PROJECT_PATH=/root/libraries/lib/gnat
+PREFIX = /usr/local/ada
+
+export ADA_PROJECT_PATH=$(PREFIX)/lib/gnat
 
 all: install
 
@@ -18,4 +20,4 @@ all: install
 	@touch $@
 
 install: .$(PKG)-built
-	cd $(PKG) && make install
+	cd $(PKG) && make PREFIX=$(PREFIX) install
diff --git a/testing/scripts/recipes/007_x509-ada.mk b/testing/scripts/recipes/007_x509-ada.mk
index 319a6e28b9..121a144142 100644
--- a/testing/scripts/recipes/007_x509-ada.mk
+++ b/testing/scripts/recipes/007_x509-ada.mk
@@ -4,6 +4,8 @@ PKG = x509-ada
 SRC = http://git.codelabs.ch/git/$(PKG).git
 REV = v0.1
 
+PREFIX = /usr/local/ada
+
 all: install
 
 .$(PKG)-cloned:
@@ -16,4 +18,4 @@ all: install
 	@touch $@
 
 install: .$(PKG)-built
-	cd $(PKG) && make install
+	cd $(PKG) && make PREFIX=$(PREFIX) install
diff --git a/testing/scripts/recipes/008_xfrm-ada.mk b/testing/scripts/recipes/008_xfrm-ada.mk
index f44a2822be..6ad451340a 100644
--- a/testing/scripts/recipes/008_xfrm-ada.mk
+++ b/testing/scripts/recipes/008_xfrm-ada.mk
@@ -4,7 +4,9 @@ PKG = xfrm-ada
 SRC = http://git.codelabs.ch/git/$(PKG).git
 REV = v0.1
 
-export ADA_PROJECT_PATH=/root/libraries/lib/gnat
+PREFIX = /usr/local/ada
+
+export ADA_PROJECT_PATH=$(PREFIX)/lib/gnat
 
 all: install
 
@@ -18,4 +20,4 @@ all: install
 	@touch $@
 
 install: .$(PKG)-built
-	cd $(PKG) && make install
+	cd $(PKG) && make PREFIX=$(PREFIX) install
diff --git a/testing/scripts/recipes/009_tkm.mk b/testing/scripts/recipes/009_tkm.mk
index e8ced8a61b..971cd170f4 100644
--- a/testing/scripts/recipes/009_tkm.mk
+++ b/testing/scripts/recipes/009_tkm.mk
@@ -4,7 +4,7 @@ PKG = tkm
 SRC = http://git.codelabs.ch/git/$(PKG).git
 REV = v0.1
 
-export ADA_PROJECT_PATH=/root/libraries/lib/gnat
+export ADA_PROJECT_PATH=/usr/local/ada/lib/gnat
 
 all: install
 
diff --git a/testing/scripts/recipes/010_strongswan.mk b/testing/scripts/recipes/010_strongswan.mk
index 4390bf49f1..28db5955c2 100644
--- a/testing/scripts/recipes/010_strongswan.mk
+++ b/testing/scripts/recipes/010_strongswan.mk
@@ -72,7 +72,7 @@ CONFIG_OPTS = \
 	--enable-ipseckey \
 	--enable-tkm
 
-export ADA_PROJECT_PATH=/root/libraries/lib/gnat
+export ADA_PROJECT_PATH=/usr/local/ada/lib/gnat
 
 all: install
 
diff --git a/testing/scripts/recipes/011_xfrm-proxy.mk b/testing/scripts/recipes/011_xfrm-proxy.mk
index aea69703dd..569fbfe3c5 100644
--- a/testing/scripts/recipes/011_xfrm-proxy.mk
+++ b/testing/scripts/recipes/011_xfrm-proxy.mk
@@ -4,7 +4,7 @@ PKG = xfrm-proxy
 SRC = http://git.codelabs.ch/git/$(PKG).git
 REV = v0.1
 
-export ADA_PROJECT_PATH=/root/libraries/lib/gnat
+export ADA_PROJECT_PATH=/usr/local/ada/lib/gnat
 
 all: install