-@@ -234,11 +239,10 @@ def configure(conf):
- conf.env['CXXDEFINES'] += ["XMMS_VERSION=\"\\\"%s\\\"\"" % VERSION]
-
- if Params.g_options.config_prefix:
-- conf.env["LIBPATH"] += [os.path.join(Params.g_options.config_prefix, "lib")]
- include = [os.path.join(Params.g_options.config_prefix, "include")]
- conf.env['CPPPATH'] += include
-
-- conf.env["LINKFLAGS_xlibs"] += ['-install_name %s%s%s' % (os.path.join(conf.env["PREFIX"], 'lib', conf.env["shlib_PREFIX"]), '%s', conf.env["shlib_SUFFIX"])]
-+ conf.env["LINKFLAGS_xlibs"] += ['-install_name %s%s%s' % (os.path.join(conf.env["LIBDIR"], conf.env["shlib_PREFIX"]), '%s', conf.env["shlib_SUFFIX"])]
-
- # Our static libraries may link to dynamic libraries
- conf.env["staticlib_CCFLAGS"] += ['-fPIC', '-DPIC']
-@@ -303,6 +308,7 @@ def set_options(opt):
- opt.add_option('--conf-prefix', type='string', dest='config_prefix')
- opt.add_option('--without-xmms2d', type='int', dest='without_xmms2d')
- opt.add_option('--with-mandir', type='string', dest='manualdir')
-+ opt.add_option('--libdir', type='string', dest='libdir')
-
- for o in optional_subdirs + subdirs:
- opt.sub_options(o)
---- xmms2-0.2DrJekyll/wafadmin/Tools/gcc.py.orig 2007-05-20 17:55:40.000000000 +0200
-+++ xmms2-0.2DrJekyll/wafadmin/Tools/gcc.py 2023-05-19 16:58:09.314656440 +0200
-@@ -81,7 +81,7 @@ def detect(conf):
- if not dest: dest=orig
- try: conf.env[dest] = ron[orig]
- except KeyError: pass
-- addflags('CCFLAGS', 'CFLAGS')
-+ addflags('CCFLAGS')
- addflags('CPPFLAGS')
- addflags('LINKFLAGS')
-