|
 |
f5e49dd |
diff -up xmms2-0.6DrMattDestruction/src/include/xmms/wscript.BAD xmms2-0.6DrMattDestruction/src/include/xmms/wscript
|
|
|
f5e49dd |
--- xmms2-0.6DrMattDestruction/src/include/xmms/wscript.BAD 2009-08-11 15:17:57.020242949 -0400
|
|
|
f5e49dd |
+++ xmms2-0.6DrMattDestruction/src/include/xmms/wscript 2009-08-11 15:18:04.940381687 -0400
|
|
|
f5e49dd |
@@ -15,8 +15,7 @@ def configure(conf):
|
|
|
f5e49dd |
|
|
|
f5e49dd |
defs = {}
|
|
|
f5e49dd |
|
|
|
f5e49dd |
- defs['PKGLIBDIR'] = os.path.join(conf.env['PREFIX'],
|
|
|
f5e49dd |
- 'lib', 'xmms2')
|
|
|
f5e49dd |
+ defs['PKGLIBDIR'] = os.path.join(conf.env['LIBDIR'], 'xmms2')
|
|
|
f5e49dd |
defs['BINDIR'] = conf.env['BINDIR']
|
|
|
f5e49dd |
defs['SHAREDDIR'] = os.path.join(conf.env['PREFIX'],
|
|
|
f5e49dd |
'share', 'xmms2')
|
|
|
f5e49dd |
diff -up xmms2-0.6DrMattDestruction/waftools/tool.py.BAD xmms2-0.6DrMattDestruction/waftools/tool.py
|
|
|
f5e49dd |
--- xmms2-0.6DrMattDestruction/waftools/tool.py.BAD 2009-08-11 15:28:30.157242468 -0400
|
|
|
f5e49dd |
+++ xmms2-0.6DrMattDestruction/waftools/tool.py 2009-08-11 15:28:45.251245035 -0400
|
|
|
f5e49dd |
@@ -6,5 +6,5 @@ def add_install_flag(bld, obj):
|
|
|
f5e49dd |
|
|
|
f5e49dd |
if env['explicit_install_name']:
|
|
|
f5e49dd |
libname = obj.env["shlib_PATTERN"] % obj.target
|
|
|
f5e49dd |
- insname = os.path.join(obj.env["PREFIX"], 'lib', libname)
|
|
|
f5e49dd |
+ insname = os.path.join(obj.env["LIBDIR"], libname)
|
|
|
f5e49dd |
obj.env.append_unique("LINKFLAGS", '-install_name ' + insname)
|
|
|
f5e49dd |
diff -up xmms2-0.6DrMattDestruction/wafadmin/Tools/libtool.py.BAD xmms2-0.6DrMattDestruction/wafadmin/Tools/libtool.py
|
|
|
f5e49dd |
--- xmms2-0.6DrMattDestruction/wafadmin/Tools/libtool.py.BAD 2009-08-11 15:33:10.276383650 -0400
|
|
|
f5e49dd |
+++ xmms2-0.6DrMattDestruction/wafadmin/Tools/libtool.py 2009-08-11 15:33:33.646236480 -0400
|
|
|
f5e49dd |
@@ -45,7 +45,7 @@ def fakelibtool_build(task):
|
|
|
f5e49dd |
fu("current=0\n")
|
|
|
f5e49dd |
fu("age=0\nrevision=0\ninstalled=yes\nshouldnotlink=no\n")
|
|
|
f5e49dd |
fu("dlopen=''\ndlpreopen=''\n")
|
|
|
f5e49dd |
- fu("libdir='%s/lib'\n" % env['PREFIX'])
|
|
|
f5e49dd |
+ fu("libdir='%s'\n" % env['LIBDIR'])
|
|
|
f5e49dd |
dest.close()
|
|
|
f5e49dd |
return 0
|
|
|
f5e49dd |
|
|
|
f5e49dd |
@@ -75,7 +75,7 @@ def apply_link_libtool(self):
|
|
|
f5e49dd |
self.latask = latask
|
|
|
f5e49dd |
|
|
|
f5e49dd |
if Options.commands['install'] or Options.commands['uninstall']:
|
|
|
f5e49dd |
- Build.bld.install_files('PREFIX', 'lib', linktask.outputs[0].abspath(self.env), self.env)
|
|
|
f5e49dd |
+ Build.bld.install_files('LIBDIR', linktask.outputs[0].abspath(self.env), self.env)
|
|
|
f5e49dd |
|
|
|
f5e49dd |
@taskgen
|
|
|
f5e49dd |
@feature("libtool")
|
|
|
f5e49dd |
diff -up xmms2-0.6DrMattDestruction/wafadmin/Tools/ccroot.py.BAD xmms2-0.6DrMattDestruction/wafadmin/Tools/ccroot.py
|
|
|
f5e49dd |
--- xmms2-0.6DrMattDestruction/wafadmin/Tools/ccroot.py.BAD 2009-08-11 15:35:28.864257981 -0400
|
|
|
f5e49dd |
+++ xmms2-0.6DrMattDestruction/wafadmin/Tools/ccroot.py 2009-08-11 15:35:36.165270276 -0400
|
|
|
f5e49dd |
@@ -127,7 +127,7 @@ def vars_target_cprogram(self):
|
|
|
f5e49dd |
@feature('cstaticlib', 'dstaticlib', 'cshlib', 'dshlib')
|
|
|
f5e49dd |
@before('apply_core')
|
|
|
f5e49dd |
def vars_target_cstaticlib(self):
|
|
|
f5e49dd |
- self.default_install_path = '${PREFIX}/lib'
|
|
|
f5e49dd |
+ self.default_install_path = '${LIBDIR}'
|
|
|
f5e49dd |
if sys.platform in ['win32', 'cygwin']:
|
|
|
f5e49dd |
# on win32, libraries need the execute bit, else we
|
|
|
f5e49dd |
# get 'permission denied' when using them (issue 283)
|
|
|
f5e49dd |
diff -up xmms2-0.6DrMattDestruction/wafadmin/Tools/gnu_dirs.py.BAD xmms2-0.6DrMattDestruction/wafadmin/Tools/gnu_dirs.py
|
|
|
f5e49dd |
--- xmms2-0.6DrMattDestruction/wafadmin/Tools/gnu_dirs.py.BAD 2009-08-11 15:35:49.334273249 -0400
|
|
|
f5e49dd |
+++ xmms2-0.6DrMattDestruction/wafadmin/Tools/gnu_dirs.py 2009-08-11 15:36:35.058242288 -0400
|
|
|
f5e49dd |
@@ -39,7 +39,7 @@ libexecdir, program executables, $(EXEC_
|
|
|
f5e49dd |
sysconfdir, read-only single-machine data, $(PREFIX)/etc
|
|
|
f5e49dd |
sharedstatedir, modifiable architecture-independent data, $(PREFIX)/com
|
|
|
f5e49dd |
localstatedir, modifiable single-machine data, $(PREFIX)/var
|
|
|
f5e49dd |
-libdir, object code libraries, $(EXEC_PREFIX)/lib
|
|
|
f5e49dd |
+libdir, object code libraries, $(LIBDIR)
|
|
|
f5e49dd |
includedir, C header files, $(PREFIX)/include
|
|
|
f5e49dd |
oldincludedir, C header files for non-gcc, /usr/include
|
|
|
f5e49dd |
datarootdir, read-only arch.-independent data root, $(PREFIX)/share
|