From 568ad71ca6a43e62e9d641a1e77a99652018c2ae Mon Sep 17 00:00:00 2001
From: Claudius Holeksa <mail@keldu.de>
Date: Mon, 14 Feb 2022 18:53:33 +0100
Subject: [PATCH] streamlined build to fit nixos packaging

---
 .gitignore      |  2 +-
 SConstruct      | 31 +++++++++++++++++++++----------
 test/SConscript |  2 +-
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9077e63..1078054 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,7 +59,7 @@ Mkfile.old
 dkms.conf
 
 # binary files
-bin/
+build/
 # test files
 assets/
 # custom build tracking
diff --git a/SConstruct b/SConstruct
index a08d83c..8bd2030 100644
--- a/SConstruct
+++ b/SConstruct
@@ -29,15 +29,26 @@ def add_kel_source_files(self, sources, filetype, lib_env=None, shared=False, ta
             sources.append( self.StaticObject( target=target_name, source=path ) )
     pass
 
-env=Environment(ENV=os.environ, CPPPATH=['#source/forstio','#source','#','#driver'],
+def isAbsolutePath(key, dirname, env):
+	assert os.path.isabs(dirname), "%r must have absolute path syntax" % (key,)
+
+env_vars = Variables(
+	args=ARGUMENTS
+)
+
+env_vars.Add('prefix',
+	help='Installation target location of build results and headers',
+	default='/usr/local/',
+	validator=isAbsolutePath
+)
+
+env=Environment(ENV=os.environ, variables=env_vars, CPPPATH=['#source/forstio','#source','#','#driver'],
     CXX='clang++',
     CPPDEFINES=['SAW_UNIX'],
     CXXFLAGS=['-std=c++20','-g','-Wall','-Wextra'],
     LIBS=['gnutls'])
 env.__class__.add_source_files = add_kel_source_files
 
-print(os.environ)
-
 env.objects = []
 env.sources = []
 env.headers = []
@@ -58,11 +69,11 @@ env_library = env.Clone()
 
 env.objects_shared = []
 env_library.add_source_files(env.objects_shared, env.sources + env.driver_sources + env.tls_sources, shared=True)
-env.library_shared = env_library.SharedLibrary('#bin/forstio', [env.objects_shared])
+env.library_shared = env_library.SharedLibrary('#build/forstio', [env.objects_shared])
 
 env.objects_static = []
 env_library.add_source_files(env.objects_static, env.sources + env.driver_sources + env.tls_sources)
-env.library_static = env_library.StaticLibrary('#bin/forstio', [env.objects_static])
+env.library_static = env_library.StaticLibrary('#build/forstio', [env.objects_static])
 
 env.Alias('library', [env.library_shared, env.library_static])
 env.Alias('library_shared', env.library_shared)
@@ -89,9 +100,9 @@ env.Alias('format', env.format_actions)
 
 env.Alias('all', ['format', 'library_shared', 'library_static', 'test'])
 
-env.Install('/usr/local/lib/', [env.library_shared, env.library_static])
-env.Install('/usr/local/include/forstio/', [env.headers])
-env.Install('/usr/local/include/forstio/tls/', [env.tls_headers])
+env.Install('$prefix/lib/', [env.library_shared, env.library_static])
+env.Install('$prefix/include/forstio/', [env.headers])
+env.Install('$prefix/include/forstio/tls/', [env.tls_headers])
 
-env.Install('/usr/local/include/forstio/test/', [env.test_headers])
-env.Alias('install', '/usr/local/')
+env.Install('$prefix/include/forstio/test/', [env.test_headers])
+env.Alias('install', '$prefix')
diff --git a/test/SConscript b/test/SConscript
index 0d52054..8d9d3a6 100644
--- a/test/SConscript
+++ b/test/SConscript
@@ -15,4 +15,4 @@ env.test_objects = []
 env.test_sources.append(dir_path+'/suite/suite.cpp')
 env.test_headers = [dir_path + '/suite/suite.h']
 
-env.test_program = env_test.Program('#bin/test', [env.test_sources, env.library_static])
+env.test_program = env_test.Program('#build/test', [env.test_sources, env.library_static])