Gentoo Archives: gentoo-commits

From: "Yuri Vasilevski (yvasilev)" <yvasilev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-plugins/matchbox-desktop-image-browser/files: matchbox-desktop-image-browser-0.2-plugin-location-fix.patch
Date: Wed, 06 Jan 2010 01:24:16
Message-Id: E1NSKdB-000741-Pl@stork.gentoo.org
1 yvasilev 10/01/06 01:24:13
2
3 Added:
4 matchbox-desktop-image-browser-0.2-plugin-location-fix.patch
5 Log:
6 Fixed the installation path for the dynamically loadable mb-desktop module. Bug #298871, thanks flameeyes for reporting.
7 (Portage version: 2.1.7.16/cvs/Linux i686)
8
9 Revision Changes Path
10 1.1 x11-plugins/matchbox-desktop-image-browser/files/matchbox-desktop-image-browser-0.2-plugin-location-fix.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/matchbox-desktop-image-browser/files/matchbox-desktop-image-browser-0.2-plugin-location-fix.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/matchbox-desktop-image-browser/files/matchbox-desktop-image-browser-0.2-plugin-location-fix.patch?rev=1.1&content-type=text/plain
14
15 Index: matchbox-desktop-image-browser-0.2-plugin-location-fix.patch
16 ===================================================================
17 diff -Naurp mb-desktop-image-browser-0.2.orig/configure.ac mb-desktop-image-browser-0.2/configure.ac
18 --- mb-desktop-image-browser-0.2.orig/configure.ac 2010-01-06 01:05:40.000000000 +0000
19 +++ mb-desktop-image-browser-0.2/configure.ac 2010-01-06 01:07:24.000000000 +0000
20 @@ -34,6 +34,20 @@ AC_ARG_ENABLE(debug,
21 MB_CFLAGS="$MB_CFLAGS -DDEBUG"
22 fi])
23
24 +
25 +dnl ------ Substitute in found libs, clags to Makefiles etc -----------------
26 +
27 +if test "x$prefix" = xNONE; then
28 + prefix="${ac_default_prefix}"
29 +fi
30 +if test "x$exec_prefix" = xNONE; then
31 + exec_prefix='${prefix}'
32 +fi
33 +
34 +MBDESKTOP_PLUGIN_DIR=$libdir/matchbox/desktop
35 +eval MBDESKTOP_PLUGIN_DIR=`eval echo "$MBDESKTOP_PLUGIN_DIR"`
36 +
37 +AC_SUBST(MBDESKTOP_PLUGIN_DIR)
38 AC_SUBST(MB_LIBS)
39 AC_SUBST(MB_CFLAGS)
40
41 diff -Naurp mb-desktop-image-browser-0.2.orig/Makefile.am mb-desktop-image-browser-0.2/Makefile.am
42 --- mb-desktop-image-browser-0.2.orig/Makefile.am 2010-01-06 01:05:40.000000000 +0000
43 +++ mb-desktop-image-browser-0.2/Makefile.am 2010-01-06 01:07:01.000000000 +0000
44 @@ -4,7 +4,7 @@ LDADD = $(MB_LIBS)
45 AM_CFLAGS = $(MB_CFLAGS) -g -DDATADIR=\"$(datadir)\"
46
47 lib_LTLIBRARIES = imgbrowser.la
48 -libdir = $(datadir)/matchbox/desktop/modules
49 +libdir = $(MBDESKTOP_PLUGIN_DIR)
50
51 imgbrowser_la_SOURCES = imgbrowser.c
52 imgbrowser_la_LIBADD = $(LDADD)