LADI
/
ladish
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2 from mekanix/master 

Add --libdir option
This commit is contained in:
Nedko Arnaudov 2013-02-22 02:54:26 -08:00
parent fcb16ae71e 8e38b76f1d
commit 96491b7e57
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wscript
View File

@ -54,6 +54,7 @@ def options(opt):
opt.add_option('--distname', type='string', default=None, help="Name for the distribution tarball")
opt.add_option('--distsuffix', type='string', default="", help="String to append to the distribution tarball name")
opt.add_option('--tagdist', action='store_true', default=False, help='Create of git tag for distname')
opt.add_option('--libdir', type='string', default=None, help='Define lib dir')
if parallel_debug:
opt.load('parallel_debug')
@ -132,7 +133,10 @@ def configure(conf):
else:
conf.env['DBUS_SERVICES_DIR'] = os.path.join(os.path.normpath(conf.env['PREFIX']), 'share', 'dbus-1', 'services')
conf.env['LIBDIR'] = os.path.join(os.path.normpath(conf.env['PREFIX']), 'lib')
if Options.options.libdir:
conf.env['LIBDIR'] = Options.options.libdir
else:
conf.env['LIBDIR'] = os.path.join(os.path.normpath(conf.env['PREFIX']), 'lib')
conf.env['BUILD_DOXYGEN_DOCS'] = Options.options.doxygen
@ -629,7 +633,7 @@ def build(bld):
# GtkBuilder UI definitions (XML)
bld.install_files('${DATA_DIR}', 'gui/gladish.ui')
bld.install_files('${PREFIX}/bin', 'ladish_control', chmod=0755)
# 'Desktop' file (menu entry, icon, etc)