revise build scripts

[platform/upstream/iotivity.git] / build_common / SConscript

diff --git a/build_common/SConscript b/build_common/SConscript
index d808228..3a3ac44 100644 (file)
--- a/build_common/SConscript
+++ b/build_common/SConscript
@@ -126,8 +126,11 @@ if target_os in ['android', 'arduino']: # Android/Arduino always uses GNU compil
                        tools = ['gnulink', 'gcc', 'g++', 'ar', 'as', 'textfile']
                        )
 else:
-       env = Environment(variables = help_vars, tools = ['default', 'textfile'], TARGET_ARCH = target_arch, TARGET_OS = target_os, PREFIX = GetOption('prefix'))
-
+       env = Environment(variables = help_vars, tools = ['default', 'textfile'],
+                       TARGET_ARCH = target_arch, TARGET_OS = target_os,
+                       PREFIX = GetOption('prefix'),
+                       LIB_INSTALL_DIR = ARGUMENTS.get('LIB_INSTALL_DIR', '/usr/lib')
+                       )
 Help(help_vars.GenerateHelpText(env))
 
 tc_set_msg = '''
@@ -210,7 +213,7 @@ def __install(ienv, targets, name):
 def __installlib(ienv, targets, name):
        user_prefix = env.get('PREFIX')
        if user_prefix:
-               i_n = ienv.Install(user_prefix + '/lib', targets)
+               i_n = ienv.Install(env.get('LIB_INSTALL_DIR'), targets)
        else:
                i_n = ienv.Install(env.get('BUILD_DIR'), targets)
        ienv.Alias("install", i_n)
@@ -226,7 +229,7 @@ def __installbin(ienv, targets, name):
 def __installheader(ienv, targets, dir, name):
        user_prefix = env.get('PREFIX')
        if user_prefix:
-               i_n = ienv.Install(user_prefix + '/include/' + dir ,targets)
+               i_n = ienv.Install(user_prefix + '/include/' + dir, targets)
        else:
                i_n = ienv.Install(env.get('BUILD_DIR'), targets)
        ienv.Alias("install", i_n)
@@ -234,7 +237,7 @@ def __installheader(ienv, targets, dir, name):
 def __installpcfile(ienv, targets, name):
        user_prefix = env.get('PREFIX')
        if user_prefix:
-               i_n = ienv.Install(user_prefix + '/lib/pkgconfig', targets)
+               i_n = ienv.Install(env.get('LIB_INSTALL_DIR') + '/pkgconfig', targets)
        else:
                i_n = ienv.Install(env.get('BUILD_DIR'), targets)
        ienv.Alias("install", i_n)
@@ -276,12 +279,22 @@ Export('env')
 ######################################################################
 pc_file = env.get('SRC_DIR') + '/iotivity.pc.in'
 
+if env.get('ROUTING') == 'GW':
+       routing_define = 'ROUTING_GATEWAY'
+elif env.get('ROUTING') == 'EP':
+       routing_define = 'ROUTING_EP'
+
 user_prefix = env.get('PREFIX')
 
 if user_prefix:
-       pc_vars = {'\@PREFIX\@': user_prefix, '\@EXEC_PREFIX\@':user_prefix, '\@VERSION\@':'0.9.2'}
+       pc_vars = {'\@PREFIX\@': user_prefix,
+                               '\@LIB_INSTALL_DIR\@': env.get('LIB_INSTALL_DIR'),
+                               '\@VERSION\@': '1.0.0', '\@ROUTING_DEFINE\@': routing_define
+                               }
 else:
-       pc_vars = {'\@PREFIX\@': env.get('BUILD_DIR'), '\@EXEC_PREFIX\@': env.get('BUILD_DIR'), '\@VERSION\@':'0.9.2'}
+       pc_vars = {'\@PREFIX\@': env.get('BUILD_DIR'), '\@VERSION\@': '1.0.0',
+                               '\@ROUTING_DEFINE\@': routing_define
+                               }
 
 env.Substfile(pc_file, SUBST_DICT = pc_vars)