~ salmonella-environment-setup (master) 19958a77f2d7a76d25b44c1cadbb53fa1401450c

commit 19958a77f2d7a76d25b44c1cadbb53fa1401450c
Author:     Mario Domenech Goulart <mario@parenteses.org>
AuthorDate: Sun May 27 10:46:10 2018 +0200
Commit:     Mario Domenech Goulart <mario@parenteses.org>
CommitDate: Sun May 27 10:54:36 2018 +0200

    Move shared files to the `common' directory

diff --git a/conf/chicken-4-clang.conf b/conf/chicken-4-clang.conf
index 258ce12..c668a06 100644
--- a/conf/chicken-4-clang.conf
+++ b/conf/chicken-4-clang.conf
@@ -1,5 +1,5 @@
-(load-relative "./common.scm")
-(load-relative "./chicken-4-common.scm")
+(load-relative "./common/common.scm")
+(load-relative "./common/chicken-4.scm")
 
 (c-compiler "clang")
 (c++-compiler "clang++")
diff --git a/conf/chicken-4-debugbuild-no-cache.conf b/conf/chicken-4-debugbuild-no-cache.conf
index 839876e..596809c 100644
--- a/conf/chicken-4-debugbuild-no-cache.conf
+++ b/conf/chicken-4-debugbuild-no-cache.conf
@@ -1,5 +1,5 @@
-(load-relative "./common.scm")
-(load-relative "./chicken-4-common.scm")
+(load-relative "./common/common.scm")
+(load-relative "./common/chicken-4.scm")
 
 (keep-repo? #f)
 
diff --git a/conf/chicken-4-debugbuild.conf b/conf/chicken-4-debugbuild.conf
index 36e85ad..60bbfb1 100644
--- a/conf/chicken-4-debugbuild.conf
+++ b/conf/chicken-4-debugbuild.conf
@@ -1,5 +1,5 @@
-(load-relative "./common.scm")
-(load-relative "./chicken-4-common.scm")
+(load-relative "./common/common.scm")
+(load-relative "./common/chicken-4.scm")
 
 (branch-publish-transformer
   (lambda (branch)
diff --git a/conf/chicken-4.conf b/conf/chicken-4.conf
index 38c4aa7..ea1072e 100644
--- a/conf/chicken-4.conf
+++ b/conf/chicken-4.conf
@@ -1,2 +1,2 @@
-(load-relative "./common.scm")
-(load-relative "./chicken-4-common.scm")
+(load-relative "./common/common.scm")
+(load-relative "./common/chicken-4.scm")
diff --git a/conf/chicken-5-debugbuild.conf b/conf/chicken-5-debugbuild.conf
index 8641530..1fb7486 100644
--- a/conf/chicken-5-debugbuild.conf
+++ b/conf/chicken-5-debugbuild.conf
@@ -1,5 +1,5 @@
-(load-relative "./common.scm")
-(load-relative "./chicken-5-common.scm")
+(load-relative "./common/common.scm")
+(load-relative "./common/chicken-5.scm")
 
 ;; The salmonella-linux-x86-64 machine builds eggs without cache
 (when (and (eq? (machine-type) 'x86-64)
diff --git a/conf/chicken-5.conf b/conf/chicken-5.conf
index df5aed1..196ca7f 100644
--- a/conf/chicken-5.conf
+++ b/conf/chicken-5.conf
@@ -1,4 +1,4 @@
-(load-relative "./common.scm")
-(load-relative "./chicken-5-common.scm")
+(load-relative "./common/common.scm")
+(load-relative "./common/chicken-5.scm")
 
 (chicken-core-branch "master")
diff --git a/conf/chicken-4-common.scm b/conf/common/chicken-4.scm
similarity index 100%
rename from conf/chicken-4-common.scm
rename to conf/common/chicken-4.scm
diff --git a/conf/chicken-5-common.scm b/conf/common/chicken-5.scm
similarity index 100%
rename from conf/chicken-5-common.scm
rename to conf/common/chicken-5.scm
diff --git a/conf/common.scm b/conf/common/common.scm
similarity index 100%
rename from conf/common.scm
rename to conf/common/common.scm
diff --git a/conf/prerelease.conf b/conf/prerelease.conf
index ca213a4..abc724e 100644
--- a/conf/prerelease.conf
+++ b/conf/prerelease.conf
@@ -1,3 +1,3 @@
-(load-relative "./common.scm")
+(load-relative "./common/common.scm")
 
 (chicken-core-branch "prerelease")