From 1f69a93ab1e67a2db029858c05c99ab6ce5628ce Mon Sep 17 00:00:00 2001
From: Paul Bakker <p.j.bakker@polarssl.org>
Date: Fri, 25 Apr 2014 10:04:49 +0200
Subject: [PATCH] Move configs to 'configs/' and activate-config.pl should be
 called from root

---
 {scripts/data_files => configs}/config-mini-tls1_1.h    | 3 +--
 {scripts/data_files => configs}/config-psk-rc4-tls1_0.h | 3 +--
 {scripts/data_files => configs}/config-suite-b.h        | 3 +--
 scripts/activate-config.pl                              | 2 +-
 tests/scripts/test-ref-configs.pl                       | 2 +-
 5 files changed, 5 insertions(+), 8 deletions(-)
 rename {scripts/data_files => configs}/config-mini-tls1_1.h (93%)
 rename {scripts/data_files => configs}/config-psk-rc4-tls1_0.h (90%)
 rename {scripts/data_files => configs}/config-suite-b.h (93%)

diff --git a/scripts/data_files/config-mini-tls1_1.h b/configs/config-mini-tls1_1.h
similarity index 93%
rename from scripts/data_files/config-mini-tls1_1.h
rename to configs/config-mini-tls1_1.h
index 60b4c3688..81a95f063 100644
--- a/scripts/data_files/config-mini-tls1_1.h
+++ b/configs/config-mini-tls1_1.h
@@ -3,8 +3,7 @@
  * required ciphersuite: TLS_RSA_WITH_3DES_EDE_CBC_SHA
  *
  * Can be activated with:
- *      cd scripts
- *      ./activate-config.pl data_files/config-mini-tls1_1.h
+ *      scripts/activate-config.pl configs/config-mini-tls1_1.h
  */
 
 /* PolarSSL feature support */
diff --git a/scripts/data_files/config-psk-rc4-tls1_0.h b/configs/config-psk-rc4-tls1_0.h
similarity index 90%
rename from scripts/data_files/config-psk-rc4-tls1_0.h
rename to configs/config-psk-rc4-tls1_0.h
index c809658e5..1da378c3c 100644
--- a/scripts/data_files/config-psk-rc4-tls1_0.h
+++ b/configs/config-psk-rc4-tls1_0.h
@@ -3,8 +3,7 @@
  * Distinguishing features: no bignum, no PK, no X509.
  *
  * Can be activated with:
- *      cd scripts
- *      ./activate-config.pl data_files/config-mini-tls1_1.h
+ *      scripts/activate-config.pl configs/config-mini-tls1_1.h
  */
 
 /* PolarSSL feature support */
diff --git a/scripts/data_files/config-suite-b.h b/configs/config-suite-b.h
similarity index 93%
rename from scripts/data_files/config-suite-b.h
rename to configs/config-suite-b.h
index d140d8f7f..2bfb0e124 100644
--- a/scripts/data_files/config-suite-b.h
+++ b/configs/config-suite-b.h
@@ -2,8 +2,7 @@
  * Minimal configuration for TLS NSA Suite B Profile (RFC 6460)
  *
  * Can be activated with:
- *      cd scripts
- *      ./activate-config.pl data_files/config-mini-tls1_1.h
+ *      scripts/activate-config.pl configs/config-mini-tls1_1.h
  */
 
 /* PolarSSL feature support */
diff --git a/scripts/activate-config.pl b/scripts/activate-config.pl
index 561e0676c..caa8cdc13 100755
--- a/scripts/activate-config.pl
+++ b/scripts/activate-config.pl
@@ -5,7 +5,7 @@
 use warnings;
 use strict;
 
-my $config_h = "../include/polarssl/config.h";
+my $config_h = "include/polarssl/config.h";
 
 exit( main() );
 
diff --git a/tests/scripts/test-ref-configs.pl b/tests/scripts/test-ref-configs.pl
index 68a6a60bb..4577252f6 100755
--- a/tests/scripts/test-ref-configs.pl
+++ b/tests/scripts/test-ref-configs.pl
@@ -49,7 +49,7 @@ while( my ($conf, $args) = each %configs ) {
     print "* Testing configuration: $conf\n";
     print "******************************************\n";
 
-    system( "cd scripts && ./activate-config.pl data_files/$conf" )
+    system( "scripts/activate-config.pl configs/$conf" )
         and abort "Failed to activate $conf\n";
 
     system( "make" ) and abort "Failed to build: $conf\n";