diff options
| author | Reto Buerki <reet@codelabs.ch> | 2013-03-22 10:35:48 +0100 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2013-03-22 10:35:48 +0100 |
| commit | 3db17b0ccc80b8de9e170f41ba53c96a8ad5fd6a (patch) | |
| tree | 8aba8c4270b01745bee938dd686ed525149fe8a2 | |
| parent | 2c80ab3def3dae764b5aabd11ee72f4bbadcfe3a (diff) | |
| download | strongswan-3db17b0ccc80b8de9e170f41ba53c96a8ad5fd6a.tar.bz2 strongswan-3db17b0ccc80b8de9e170f41ba53c96a8ad5fd6a.tar.xz | |
Fixed TKM build
| -rw-r--r-- | testing/scripts/recipes/005_anet.mk | 4 | ||||
| -rw-r--r-- | testing/scripts/recipes/006_tkm-rpc.mk | 6 | ||||
| -rw-r--r-- | testing/scripts/recipes/007_x509-ada.mk | 4 | ||||
| -rw-r--r-- | testing/scripts/recipes/008_xfrm-ada.mk | 6 | ||||
| -rw-r--r-- | testing/scripts/recipes/009_tkm.mk | 2 | ||||
| -rw-r--r-- | testing/scripts/recipes/010_strongswan.mk | 2 | ||||
| -rw-r--r-- | testing/scripts/recipes/011_xfrm-proxy.mk | 2 |
7 files changed, 17 insertions, 9 deletions
diff --git a/testing/scripts/recipes/005_anet.mk b/testing/scripts/recipes/005_anet.mk index 1ecb7b294..3b8e6fd2e 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 571d590d1..dc6847ca5 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 319a6e28b..121a14414 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 f44a2822b..6ad451340 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 e8ced8a61..971cd170f 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 4390bf49f..28db5955c 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 aea69703d..569fbfe3c 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 |