Hi
Intro:
The DFB installation uses MODULEDIR and DATADIR, which can
be different at runtime. For example,
the DFB installation mounted from host to the target.
Solution:
Provided configuration parameters `rt-moduledir' and
`rt-datadir' which overrides MODULEDIR and DATADIR in
there runtime usage, by creating new make variables
`RUNTIME_MODULEDIR' and `RUNTIME_DATADIR'.
Important:
The sysroot configuration parameter still useful as prefix.
Gery
Index: configure.in
============================================================
=======
RCS file: /cvs/directfb/DirectFB/configure.in,v
retrieving revision 1.293
diff -p -w -u -b -B -r1.293 configure.in
--- configure.in 5 Oct 2006 07:06:09 -0000 1.293
+++ configure.in 11 Oct 2006 07:18:15 -0000
 -1308,7
+1308,23 else
fi
MODULEDIR=$libdir/$MODULEDIRNAME
+# moduledir used for runtime module loading, overrides
MODULEDIR
+AC_ARG_WITH(moduledir,
+[ --with-rt-moduledir=DIR search for modules within
DIR at runtime]
+[ (overrides MODULEDIR)],
+[ RUNTIME_MODULEDIR="$withval/lib/$MODULEDIRNAME"
], [ RUNTIME_MODULEDIR=$MODULEDIR ] )
+test x"$RUNTIME_MODULEDIR" = x"no"
&& RUNTIME_MODULEDIR=$MODULEDIR
+AC_SUBST(RUNTIME_MODULEDIR)
+
DATADIR=$datadir/directfb-$VERSION
+# datadir used for runtime data searching, overrides
DATADIR
+AC_ARG_WITH(datadir,
+[ --with-rt-datadir=DIR search for data within DIR at
runtime]
+[ (e.g. when loading shared
data, overrides DATADIR)],
+[
RUNTIME_DATADIR="$withval/share/directfb-$VERSION"
], [ RUNTIME_DATADIR=$DATADIR ] )
+test x"$RUNTIME_DATADIR" = x"no"
&& RUNTIME_DATADIR=$DATADIR
+AC_SUBST(RUNTIME_DATADIR)
+
INCLUDEDIR=$includedir/directfb
INTERNALINCLUDEDIR=$includedir/directfb-internal
Index: lib/direct/Makefile.am
============================================================
=======
RCS file: /cvs/directfb/DirectFB/lib/direct/Makefile.am,v
retrieving revision 1.23
diff -p -w -u -b -B -r1.23 Makefile.am
--- lib/direct/Makefile.am 21 Sep 2005 16:10:11 -0000 1.23
+++ lib/direct/Makefile.am 11 Oct 2006 07:18:16 -0000
-7,8
+7,8 INCLUDES =
-I$(top_srcdir)/lib
AM_CPPFLAGS =
- -DDATADIR="$DATADIR"
- -DMODULEDIR="$MODULEDIR"
+ -DDATADIR="$RUNTIME_DATADIR"
+ -DMODULEDIR="$RUNTIME_MODULEDIR"
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = direct.pc
cvs diff: Diffing lib/fusion
Index: lib/fusion/Makefile.am
============================================================
=======
RCS file: /cvs/directfb/DirectFB/lib/fusion/Makefile.am,v
retrieving revision 1.15
diff -p -w -u -b -B -r1.15 Makefile.am
--- lib/fusion/Makefile.am 28 Sep 2006 00:35:51 -0000 1.15
+++ lib/fusion/Makefile.am 11 Oct 2006 07:18:16 -0000
-10,8
+10,8 INCLUDES =
-I$(top_srcdir)/lib
AM_CPPFLAGS =
- -DDATADIR="$DATADIR"
- -DMODULEDIR="$MODULEDIR"
+ -DDATADIR="$RUNTIME_DATADIR"
+ -DMODULEDIR="$RUNTIME_MODULEDIR"
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = fusion.pc
cvs diff: Diffing lib/fusion/shm
Index: lib/fusion/shm/Makefile.am
============================================================
=======
RCS file:
/cvs/directfb/DirectFB/lib/fusion/shm/Makefile.am,v
retrieving revision 1.3
diff -p -w -u -b -B -r1.3 Makefile.am
--- lib/fusion/shm/Makefile.am 28 Sep 2006 00:35:51
-0000 1.3
+++ lib/fusion/shm/Makefile.am 11 Oct 2006 07:18:16 -0000
-7,8
+7,8 INCLUDES =
-I$(top_srcdir)/lib
AM_CPPFLAGS =
- -DDATADIR="DATADIR"
- -DMODULEDIR="MODULEDIR"
+ -DDATADIR="RUNTIME_DATADIR"
+ -DMODULEDIR="RUNTIME_MODULEDIR"
if ENABLE_MULTI
SHMSOURCES = heap.c pool.c shm.c
cvs diff: Diffing lib/voodoo
Index: lib/voodoo/Makefile.am
============================================================
=======
RCS file: /cvs/directfb/DirectFB/lib/voodoo/Makefile.am,v
retrieving revision 1.10
diff -p -w -u -b -B -r1.10 Makefile.am
--- lib/voodoo/Makefile.am 24 Oct 2005 16:40:31 -0000 1.10
+++ lib/voodoo/Makefile.am 11 Oct 2006 07:18:16 -0000
-7,8
+7,8 INCLUDES =
-I$(top_srcdir)/lib
AM_CPPFLAGS =
- -DDATADIR="$DATADIR"
- -DMODULEDIR="$MODULEDIR"
+ -DDATADIR="$RUNTIME_DATADIR"
+ -DMODULEDIR="$RUNTIME_MODULEDIR"
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = voodoo.pc
Index: src/Makefile.am
============================================================
=======
RCS file: /cvs/directfb/DirectFB/src/Makefile.am,v
retrieving revision 1.28
diff -p -w -u -b -B -r1.28 Makefile.am
--- src/Makefile.am 26 Jul 2005 15:19:39 -0000 1.28
+++ src/Makefile.am 11 Oct 2006 07:18:16 -0000
-10,8
+10,8 INCLUDES =
-I$(top_srcdir)/src
AM_CPPFLAGS =
- -DDATADIR="$DATADIR"
- -DMODULEDIR="$MODULEDIR"
+ -DDATADIR="$RUNTIME_DATADIR"
+ -DMODULEDIR="$RUNTIME_MODULEDIR"
internalincludedir = $(INTERNALINCLUDEDIR)
cvs diff: Diffing src/core
Index: src/core/Makefile.am
============================================================
=======
RCS file: /cvs/directfb/DirectFB/src/core/Makefile.am,v
retrieving revision 1.44
diff -p -w -u -b -B -r1.44 Makefile.am
--- src/core/Makefile.am 1 May 2006 19:09:28 -0000 1.44
+++ src/core/Makefile.am 11 Oct 2006 07:18:16 -0000
-8,9
+8,9 INCLUDES =
-I$(top_srcdir)/src
AM_CPPFLAGS =
- -DDATADIR="$DATADIR"
+ -DDATADIR="$RUNTIME_DATADIR"
-DSOPATH="SOPATH"
- -DMODULEDIR="$MODULEDIR"
+ -DMODULEDIR="$RUNTIME_MODULEDIR"
"-DBUILDTIME="`date -u "+%Y-%m-%d
%H:%M"`""
Index: src/misc/Makefile.am
============================================================
=======
RCS file: /cvs/directfb/DirectFB/src/misc/Makefile.am,v
retrieving revision 1.25
diff -p -w -u -b -B -r1.25 Makefile.am
--- src/misc/Makefile.am 24 Feb 2005 14:35:31 -0000 1.25
+++ src/misc/Makefile.am 11 Oct 2006 07:18:16 -0000
-8,7
+8,7 INCLUDES =
-I$(top_srcdir)/src
AM_CPPFLAGS =
- -DMODULEDIR="MODULEDIR"
+ -DMODULEDIR="RUNTIME_MODULEDIR"
-DSOPATH="SOPATH"
internalincludedir = $(INTERNALINCLUDEDIR)/misc
Index: wm/unique/classes/Makefile.am
============================================================
=======
RCS file:
/cvs/directfb/DirectFB/wm/unique/classes/Makefile.am,v
retrieving revision 1.1
diff -p -w -u -b -B -r1.1 Makefile.am
--- wm/unique/classes/Makefile.am 30 Oct 2004 20:02:47
-0000 1.1
+++ wm/unique/classes/Makefile.am 11 Oct 2006 07:18:16 -0000
-8,7
+8,7 INCLUDES =
-I$(top_srcdir)/wm
AM_CPPFLAGS =
- -DMODULEDIR="MODULEDIR"
+ -DMODULEDIR="RUNTIME_MODULEDIR"
-DSOPATH="SOPATH"
Index: wm/unique/devices/Makefile.am
============================================================
=======
RCS file:
/cvs/directfb/DirectFB/wm/unique/devices/Makefile.am,v
retrieving revision 1.1
diff -p -w -u -b -B -r1.1 Makefile.am
--- wm/unique/devices/Makefile.am 12 Nov 2004 17:54:00
-0000 1.1
+++ wm/unique/devices/Makefile.am 11 Oct 2006 07:18:16 -0000
-8,7
+8,7 INCLUDES =
-I$(top_srcdir)/wm
AM_CPPFLAGS =
- -DMODULEDIR="MODULEDIR"
+ -DMODULEDIR="RUNTIME_MODULEDIR"
-DSOPATH="SOPATH"
_______________________________________________
directfb-dev mailing list
directfb-devdirectfb.org
http://mail.directfb.org/cgi-bin/mailman/listinfo/
directfb-dev
|