75 lines
2.9 KiB
Diff
75 lines
2.9 KiB
Diff
|
diff --git a/trunk/libgxw/gxw.pc.in b/trunk/libgxw/gxw.pc.in
|
||
|
|
index 9c72568..510a411 100644
|
||
|
|
--- a/trunk/libgxw/gxw.pc.in
|
||
|
|
+++ b/trunk/libgxw/gxw.pc.in
|
||
|
|
@@ -1,6 +1,6 @@
|
||
|
|
prefix=/path
|
||
|
|
exec_prefix=${prefix}
|
||
|
|
-libdir=${exec_prefix}/lib
|
||
|
|
+libdir=/path
|
||
|
|
datarootdir=${prefix}/share
|
||
|
|
datadir=${datarootdir}
|
||
|
|
includedir=${prefix}/include
|
||
|
|
diff --git a/trunk/libgxwmm/gxwmm.pc.in b/trunk/libgxwmm/gxwmm.pc.in
|
||
|
|
index ffd1974..e26975d 100644
|
||
|
|
--- a/trunk/libgxwmm/gxwmm.pc.in
|
||
|
|
+++ b/trunk/libgxwmm/gxwmm.pc.in
|
||
|
|
@@ -1,6 +1,6 @@
|
||
|
|
prefix=/path
|
||
|
|
exec_prefix=${prefix}
|
||
|
|
-libdir=${exec_prefix}/lib
|
||
|
|
+libdir=/path
|
||
|
|
datarootdir=${prefix}/share
|
||
|
|
datadir=${datarootdir}
|
||
|
|
includedir=${prefix}/include
|
||
|
|
diff --git a/trunk/wafadmin/Tools/libtool.py b/trunk/wafadmin/Tools/libtool.py
|
||
|
|
index 50b28ce..b4074e6 100644
|
||
|
|
--- a/trunk/wafadmin/Tools/libtool.py
|
||
|
|
+++ b/trunk/wafadmin/Tools/libtool.py
|
||
|
|
@@ -51,7 +51,7 @@ def apply_link_libtool(self):
|
||
|
|
linktask=self.link_task
|
||
|
|
self.latask=self.create_task('fakelibtool',linktask.outputs,linktask.outputs[0].change_ext('.la'))
|
||
|
|
if self.bld.is_install:
|
||
|
|
- self.bld.install_files('${PREFIX}/lib',linktask.outputs[0],self.env)
|
||
|
|
+ self.bld.install_files('${LIBDIR}',linktask.outputs[0],self.env)
|
||
|
|
def apply_libtool(self):
|
||
|
|
self.env['vnum']=self.vnum
|
||
|
|
paths=[]
|
||
|
|
@@ -101,7 +101,7 @@ class libtool_la_file:
|
||
|
|
self.shouldnotlink=None
|
||
|
|
self.dlopen=None
|
||
|
|
self.dlpreopen=None
|
||
|
|
- self.libdir='/usr/lib'
|
||
|
|
+ self.libdir='${LIBDIR}'
|
||
|
|
if not self.__parse():
|
||
|
|
raise ValueError("file %s not found!!"%(la_filename))
|
||
|
|
def __parse(self):
|
||
|
|
diff --git a/trunk/wscript b/trunk/wscript
|
||
|
|
index 32950ad..c058f93 100644
|
||
|
|
--- a/trunk/wscript
|
||
|
|
+++ b/trunk/wscript
|
||
|
|
@@ -644,7 +644,8 @@ def configure(conf):
|
||
|
|
pa = conf.env['PREFIX']
|
||
|
|
sub_file('./libgxw/gxw.pc.in', './libgxw/gxw.pc', (('prefix=/path', 'prefix=%s' % pa), ))
|
||
|
|
sub_file('./libgxwmm/gxwmm.pc.in', './libgxwmm/gxwmm.pc', (('prefix=/path', 'prefix=%s' % pa), ))
|
||
|
|
-
|
||
|
|
+ sub_file('./libgxw/gxw.pc.in', './libgxw/gxw.pc', (('libdir=/path','libdir=%s' % conf.env['LIBDIR']), ))
|
||
|
|
+ sub_file('./libgxwmm/gxwmm.pc.in', './libgxwmm/gxwmm.pc', (('libdir=/path','libdir=%s' % conf.env['LIBDIR']), ))
|
||
|
|
|
||
|
|
# some output
|
||
|
|
print("")
|
||
|
|
@@ -773,11 +774,11 @@ def build(bld):
|
||
|
|
if bld.env["GX_LIB_DEV"]:
|
||
|
|
bld.install_files('${PREFIX}/include/gxw','libgxw/gxw/*.h')
|
||
|
|
bld.install_files('${PREFIX}/include','libgxw/gxw.h')
|
||
|
|
- bld.install_files('${PREFIX}/lib/pkgconfig', './libgxw/gxw.pc')
|
||
|
|
+ bld.install_files('${LIBDIR}/pkgconfig', './libgxw/gxw.pc')
|
||
|
|
bld.install_files('${PREFIX}/include/gxwmm','libgxwmm/gxwmm-generated/*.h')
|
||
|
|
bld.install_files('${PREFIX}/include/gxwmm','libgxwmm/gxwmm/*.h')
|
||
|
|
bld.install_files('${PREFIX}/include','libgxwmm/gxwmm.h')
|
||
|
|
- bld.install_files('${PREFIX}/lib/pkgconfig', './libgxwmm/gxwmm.pc')
|
||
|
|
+ bld.install_files('${LIBDIR}/pkgconfig', './libgxwmm/gxwmm.pc')
|
||
|
|
|
||
|
|
################################################################
|
||
|
|
# other commands
|