Changeset 2753

Show
Ignore:
Timestamp:
02/05/18 03:31:26 (7 months ago)
Author:
jwoithe
Message:

static_info.txt: install under LIBDIR/libffado/ rather than PYTHONDIR/.

PYTHONDIR is usually located in a share hierarchy which (according to the
fhs) should contain architecture-independent data. To address this,
introduce the LIBDATADIR directory (which defaults to LIBDIR/libffado/) and
place static_info.txt there instead. Being under LIBDIR, architecture-
dependent data can be placed there. Since information about libraries
and paths is included in static_info.txt it clearly falls into the
architecture-dependent category.

Patch by Nicolas Boulenguez with minor changes by Jonathan Woithe.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/SConstruct

    r2747 r2753  
    5151    PathVariable( "INCLUDEDIR", "Overwrite the directory where headers are installed to.", "$PREFIX/include", PathVariable.PathAccept ), 
    5252    PathVariable( "SHAREDIR", "Overwrite the directory where misc shared files are installed to.", "$PREFIX/share/libffado", PathVariable.PathAccept ), 
     53    PathVariable( "LIBDATADIR", "Location for architecture-dependent data.", "$LIBDIR/libffado", PathVariable.PathAccept ), 
    5354    PathVariable( "MANDIR", "Overwrite the directory where manpages are installed", "$PREFIX/man", PathVariable.PathAccept ), 
    5455    PathVariable( "PYPKGDIR", "The directory where the python modules get installed.", 
     
    521522env['INCLUDEDIR'] = Template( env['INCLUDEDIR'] ).safe_substitute( env ) 
    522523env['SHAREDIR'] = Template( env['SHAREDIR'] ).safe_substitute( env ) 
     524env['LIBDATADIR'] = Template( env['LIBDATADIR'] ).safe_substitute( env ) 
    523525env['UDEVDIR'] = Template( env['UDEVDIR'] ).safe_substitute( env ) 
    524526env['PYTHON_INTERPRETER'] = Template( env['PYTHON_INTERPRETER'] ).safe_substitute( env ) 
     
    528530env['includedir'] = Template( env.destdir + env['INCLUDEDIR'] ).safe_substitute( env ) 
    529531env['sharedir'] = Template( env.destdir + env['SHAREDIR'] ).safe_substitute( env ) 
     532env['libdatadir'] = Template( env.destdir + env['LIBDATADIR'] ).safe_substitute( env ) 
    530533env['mandir'] = Template( env.destdir + env['MANDIR'] ).safe_substitute( env ) 
    531534env['pypkgdir'] = Template( env.destdir + env['PYPKGDIR'] ).safe_substitute( env ) 
     
    538541env.Alias( "install", env['includedir'] ) 
    539542env.Alias( "install", env['sharedir'] ) 
     543env.Alias( "install", env['libdatadir'] ) 
    540544env.Alias( "install", env['bindir'] ) 
    541545env.Alias( "install", env['mandir'] ) 
  • trunk/libffado/support/tools/ffado-diag.in

    r2751 r2753  
    77    2018 Nicolas Boulenguez, Jonathan Woithe 
    88""" 
    9 static_info = "$PYTHONDIR/static_info.txt" 
     9static_info = "$LIBDATADIR/static_info.txt" 
    1010# This program is free software: you can redistribute it and/or modify 
    1111# it under the terms of the GNU General Public License as published by 
  • trunk/libffado/support/tools/SConscript

    r2751 r2753  
    4141                e.PrependUnique( LIBS=["expat"] ) 
    4242 
    43 # 
    44 # For the the ffado-diag tools 
    45 e['PYTHONDIR'] = Template( os.path.join( e['SHAREDIR'], 'python' ) ).safe_substitute( e ) 
    46 # For the installation of the stuff 
    47 e['pythondir'] = Template( os.path.join( e['sharedir'], 'python' ) ).safe_substitute( e ) 
    48  
    4943e.Command( "static_info.txt", "ffado-diag", "support/tools/ffado-diag --static > $TARGET" ) 
    5044 
     
    5246 
    5347e.Install( "$bindir", "ffado-diag" ) 
    54 e.Install( "$pythondir", "static_info.txt" ) 
     48e.Install( "$libdatadir", "static_info.txt" ) 
    5549 
    5650if env['ENABLE_DICE']: