applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Patch by: Damien Carberry <damien.carberry@sun.com>

Browse source 
2008-01-25  Jens Granseuer  <jensgr@gmx.net>

	Patch by: Damien Carberry <damien.carberry@sun.com>

	* configure.in:
	* vfs-methods/fontilus/Makefile.am
	* vfs-methods/themus/Makefile.am: determine correct nautilus
	 extension dir via pkgconfig (#505364)

svn path=/trunk/; revision=8413
This commit is contained in:
Jens Granseuer 2008-01-25 19:11:55 +00:00 • committed by Jens Granseuer
parent c06bce17af
commit c8636fd373
6 changed files with 27 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2008-01-25 Jens Granseuer <jensgr@gmx.net>
Patch by: Damien Carberry <damien.carberry@sun.com>
* configure.in: determine correct nautilus extension dir via
pkgconfig (#505364)
2008-01-16 Rodrigo Moya <rodrigo@gnome-db.org> 2008-01-16 Rodrigo Moya <rodrigo@gnome-db.org>
* Makefile.am: * Makefile.am:

4
configure.in
View file

@ -258,6 +258,10 @@ if test x$enable_vfs_methods = xyes; then
FONTILUS=fontilus FONTILUS=fontilus
AC_SUBST(THEMUS) AC_SUBST(THEMUS)
AC_SUBST(FONTILUS) AC_SUBST(FONTILUS)
# Determine the install dir for the nautilus extensions.
NAUTILUSDIR=`pkg-config --variable=extensiondir libnautilus-extension`
AC_SUBST(NAUTILUSDIR)
# update LIBS for $export_dynamic # update LIBS for $export_dynamic
export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`

7
vfs-methods/fontilus/ChangeLog
View file

@ -1,3 +1,10 @@
2008-01-25 Jens Granseuer <jensgr@gmx.net>
Patch by: Damien Carberry <damien.carberry@sun.com>
* Makefile.am: determine correct nautilus extension dir via
pkgconfig (#505364)
2007-12-24 Matthias Clasen <mclasen@redhat.com> 2007-12-24 Matthias Clasen <mclasen@redhat.com>
* Makefile.am: Install the nautilus extension in the right spot. * Makefile.am: Install the nautilus extension in the right spot.

2
vfs-methods/fontilus/Makefile.am
View file

@ -19,7 +19,7 @@ gnome_thumbnail_font_SOURCES = ftstream-vfs.c thumbnailer.c
gnome_font_viewer_LDADD = $(FONT_VIEW_LIBS) gnome_font_viewer_LDADD = $(FONT_VIEW_LIBS)
gnome_font_viewer_SOURCES = ftstream-vfs.c font-view.c gnome_font_viewer_SOURCES = ftstream-vfs.c font-view.c
nautilusdir = $(libdir)/nautilus/extensions-2.0 nautilusdir = $(NAUTILUSDIR)
nautilus_LTLIBRARIES = libnautilus-fontilus.la nautilus_LTLIBRARIES = libnautilus-fontilus.la
libnautilus_fontilus_la_LDFLAGS = -module -avoid-version -no-undefined \ libnautilus_fontilus_la_LDFLAGS = -module -avoid-version -no-undefined \
-export-symbols-regex 'nautilus_module_.*' -export-symbols-regex 'nautilus_module_.*'

7
vfs-methods/themus/ChangeLog
View file

@ -1,3 +1,10 @@
2008-01-25 Jens Granseuer <jensgr@gmx.net>
Patch by: Damien Carberry <damien.carberry@sun.com>
* Makefile.am: determine correct nautilus extension dir via
pkgconfig (#505364)
2007-12-24 Matthias Clasen <mclasen@redhat.com> 2007-12-24 Matthias Clasen <mclasen@redhat.com>
* Makefile.am: Install the nautilus extension in the right spot. * Makefile.am: Install the nautilus extension in the right spot.

2
vfs-methods/themus/Makefile.am
View file

@ -13,7 +13,7 @@ bin_PROGRAMS = gnome-theme-thumbnailer themus-theme-applier
vfsmoduledir = $(libdir)/gnome-vfs-2.0/modules vfsmoduledir = $(libdir)/gnome-vfs-2.0/modules
vfsmodule_LTLIBRARIES = libtheme-method.la vfsmodule_LTLIBRARIES = libtheme-method.la
nautilusdir = $(libdir)/nautilus/extensions-2.0 nautilusdir = $(NAUTILUSDIR)
nautilus_LTLIBRARIES = libnautilus-themus.la nautilus_LTLIBRARIES = libnautilus-themus.la
libtheme_method_la_LDFLAGS = -module -avoid-version -no-undefined \ libtheme_method_la_LDFLAGS = -module -avoid-version -no-undefined \