mixxx-libdir.patch

   1 --- mixxx-1.11.0/build/depends.py.orig  2013-05-09 01:20:26.000000000 +0200
   2 +++ mixxx-1.11.0/build/depends.py       2018-10-21 08:31:44.564677062 +0200
   3 @@ -898,9 +898,11 @@
   4          # RESOURCE_PATH that covers Win and OSX too:
   5          if build.platform_is_linux or build.platform_is_bsd:
   6              prefix = SCons.ARGUMENTS.get('prefix', '/usr/local')
   7 -            share_path = os.path.join(prefix, 'share/mixxx')
   8 +            datadir = SCons.ARGUMENTS.get('datadir', os.path.join(prefix, 'share'))
   9 +            share_path = os.path.join(datadir, 'mixxx')
  10              build.env.Append(CPPDEFINES=('UNIX_SHARE_PATH', r'\"%s\"' % share_path))
  11 -            lib_path = os.path.join(prefix, 'lib/mixxx')
  12 +            libdir = SCons.ARGUMENTS.get('libdir', os.path.join(prefix, 'lib'))
  13 +            lib_path = os.path.join(libdir, 'mixxx')
  14              build.env.Append(CPPDEFINES=('UNIX_LIB_PATH', r'\"%s\"' % lib_path))
  15
  16      def depends(self, build):
  17 --- mixxx-1.11.0/src/SConscript.orig    2013-05-09 01:20:26.000000000 +0200
  18 +++ mixxx-1.11.0/src/SConscript 2018-10-21 08:35:27.378007853 +0200
  19 @@ -237,6 +237,9 @@
  20
  21  if build.platform_is_linux or build.platform_is_bsd:
  22          flags['prefix'] = ARGUMENTS.get('prefix', '/usr/local')
  23 +        flags['datadir'] = ARGUMENTS.get('datadir', os.path.join(flags['prefix'], 'share'))
  24 +        flags['bindir'] = ARGUMENTS.get('bindir', os.path.join(flags['prefix'], 'bin'))
  25 +        flags['libdir'] = ARGUMENTS.get('libdir', os.path.join(flags['prefix'], 'lib'))
  26          if not os.path.exists(flags['prefix']):
  27                  print "Error: Prefix path does not exist!"
  28                  Exit(1)
  29 @@ -245,11 +248,11 @@
  30                  #Basically, the flags['prefix'] is compiled into strings in Mixxx, whereas the install_root is not. When you're
  31                  #building a Debian package, pbuilder wants to install Mixxx to a temporary directory, but you still need
  32                  #the compiled-in strings using /usr as the prefix. That's why we have install_root and flags['prefix'].
  33 -                install_root = ARGUMENTS.get('install_root', flags['prefix'])
  34 +                install_root = ARGUMENTS.get('install_root', '')
  35                  print "Install root: " + install_root
  36 -                unix_share_path = os.path.join(install_root, 'share')
  37 -                unix_bin_path = os.path.join(install_root, 'bin')
  38 -                unix_lib_path = os.path.join(install_root, 'lib')
  39 +                unix_share_path = install_root + flags['datadir']
  40 +                unix_bin_path = install_root + flags['bindir']
  41 +                unix_lib_path = install_root + flags['libdir']
  42
  43                  binary = env.Install(unix_bin_path, binary_files)
  44                  resource = env.Install(os.path.join(unix_share_path, 'mixxx'), resource_files)