From ae0652f3cc38ed0bc0252ff3d4383db9b3f9a2f8 Mon Sep 17 00:00:00 2001
From: Barrett17 <b.vitruvio@gmail.com>
Date: Wed, 24 Jun 2015 15:31:54 +0000
Subject: [PATCH] Finally cleaned up the buildsystem.

---
 Jamfile             |  2 +-
 application/Jamfile |  6 +++---
 configure           | 14 ++++++--------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/Jamfile b/Jamfile
index 289e4eb..245cf98 100644
--- a/Jamfile
+++ b/Jamfile
@@ -8,4 +8,4 @@ SubInclude TOP smileys ;
 SubInclude TOP tests ;
 
 UninstallTarget $(CAYA_DIRECTORY) ;
-UninstallTarget $(COMMON_INCLUDE_DIRECTORY)/caya ;
+UninstallTarget $(SYSTEM_INCLUDE_DIRECTORY)/caya ;
diff --git a/application/Jamfile b/application/Jamfile
index c81bb84..85e084d 100644
--- a/application/Jamfile
+++ b/application/Jamfile
@@ -72,6 +72,6 @@ LINKFLAGS on Caya += -L$(EXPAT_LIBRARY_DIR) ;
 
 InstallBin $(CAYA_DIRECTORY) : Caya ;
 
-InstallFile $(COMMON_INCLUDE_DIRECTORY)/caya : CayaConstants.h ;
-InstallFile $(COMMON_INCLUDE_DIRECTORY)/caya : CayaProtocol.h ;
-InstallFile $(COMMON_INCLUDE_DIRECTORY)/caya : CayaProtocolMessages.h ;
+InstallFile $(SYSTEM_INCLUDE_DIRECTORY)/caya : CayaConstants.h ;
+InstallFile $(SYSTEM_INCLUDE_DIRECTORY)/caya : CayaProtocol.h ;
+InstallFile $(SYSTEM_INCLUDE_DIRECTORY)/caya : CayaProtocolMessages.h ;
diff --git a/configure b/configure
index ba01994..db3eb2a 100755
--- a/configure
+++ b/configure
@@ -1,10 +1,12 @@
 #!/bin/sh
 #
+# Copyright 2014-2015, Dario Casalinuovo.
 # Copyright 2009, Pier Luigi Fiorini.
 # Distributed under the terms of the MIT License.
 #
 # Authors:
 #		Pier Luigi Fiorini, pierluigi.fiorini@gmail.com
+#		Dario Casalinuovo
 #
 
 current_dir=`pwd`
@@ -122,17 +124,13 @@ MIMESET = ${mimesetbin} ;
 SETVERSION = ${setversionbin} ;
 COPYATTR = ${copyattrbin} ;
 
-#TODO common doesn't exists anymore, change COMMON to SYSTEM
-COMMON_BIN_DIRECTORY = $(finddir B_SYSTEM_BIN_DIRECTORY) ;
-COMMON_INCLUDE_DIRECTORY = $(finddir B_SYSTEM_HEADERS_DIRECTORY) ;
-COMMON_LIB_DIRECTORY = $(finddir B_SYSTEM_DEVELOP_DIRECTORY)/lib ;
-COMMON_SERVERS_DIRECTORY = $(finddir B_SYSTEM_SERVERS_DIRECTORY) ;
-COMMON_ADDONS_DIRECTORY = $(finddir B_SYSTEM_ADDONS_DIRECTORY) ;
-COMMON_DEVELOP_DIRECTORY = $(finddir B_SYSTEM_DEVELOP_DIRECTORY) ;
-
 USER_CONFIG_DIRECTORY = $(finddir B_USER_CONFIG_DIRECTORY) ;
 
 SYSTEM_DIRECTORY = $(finddir B_SYSTEM_DIRECTORY) ;
+SYSTEM_BIN_DIRECTORY = $(finddir B_SYSTEM_BIN_DIRECTORY) ;
+SYSTEM_SERVERS_DIRECTORY = $(finddir B_SYSTEM_SERVERS_DIRECTORY) ;
+SYSTEM_ADDONS_DIRECTORY = $(finddir B_SYSTEM_ADDONS_DIRECTORY) ;
+SYSTEM_DEVELOP_DIRECTORY = $(finddir B_SYSTEM_DEVELOP_DIRECTORY) ;
 SYSTEM_INCLUDE_DIRECTORY = $(finddir B_SYSTEM_HEADERS_DIRECTORY) ;
 SYSTEM_DEVELOP_LIB_DIRECTORY = $(finddir B_SYSTEM_DEVELOP_DIRECTORY)/lib ;
 SYSTEM_LIB_DIRECTORY = $(finddir B_SYSTEM_LIB_DIRECTORY) ;