Use -V instead of -v option to print version for consistency with other utilities.

[android-x86/external-exfat.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index 997e8e4..e40a340 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -2,7 +2,7 @@
 #      SConstruct (10.09.09)
 #      SConscript for all components.
 #
-#      Copyright (C) 2010-2012  Andrew Nayenko
+#      Copyright (C) 2010-2013  Andrew Nayenko
 #
 #      This program is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU General Public License as published by
@@ -23,16 +23,21 @@ import platform
 import SCons
 
 env = Environment(**ARGUMENTS)
-env['ENV']['PATH'] = os.environ['PATH']
+for var in ['PATH', 'SYSROOT']:
+       if var in os.environ:
+               env['ENV'][var] = os.environ[var]
 
 destdir = env.get('DESTDIR', '/sbin');
-targets = []
 libs = ['exfat']
 libfuse = 'fuse'
 
 if not env.GetOption('clean'):
        conf = Configure(env)
 
+       if 'AR' in os.environ:
+               conf.env.Replace(AR = os.environ['AR'])
+       if 'RANLIB' in os.environ:
+               conf.env.Replace(RANLIB = os.environ['RANLIB'])
        if 'CC' in os.environ:
                conf.env.Replace(CC = os.environ['CC'])
        if 'CCFLAGS' in os.environ:
@@ -117,7 +122,6 @@ def program(pattern, output, alias, libs):
                                destdir + '/' + alias)
        else:
                Alias('install', Install(destdir, target))
-       targets.append(target)
 
 env.Library('libexfat/exfat', Glob('libexfat/*.c'))
 
@@ -126,5 +130,3 @@ program('dump/*.c', 'dump/dumpexfat', None, libs)
 program('fsck/*.c', 'fsck/exfatfsck', 'fsck.exfat', libs)
 program('mkfs/*.c', 'mkfs/mkexfatfs', 'mkfs.exfat', libs)
 program('label/*.c', 'label/exfatlabel', None, libs)
-
-Default(targets)