[gthumb] use the default data dir instead of hardcoding the gthumb-2.0 value
- From: Paolo Bacchilega <paobac src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gthumb] use the default data dir instead of hardcoding the gthumb-2.0 value
- Date: Wed, 6 Jan 2010 14:23:44 +0000 (UTC)
commit af9e32e5354ded213c1480b4e85eff00f3836de0
Author: Paolo Bacchilega <paobac src gnome org>
Date: Wed Jan 6 14:55:04 2010 +0100
use the default data dir instead of hardcoding the gthumb-2.0 value
[bug #606052]
data/ui/Makefile.am | 2 +-
extensions/bookmarks/Makefile.am | 2 +-
extensions/bookmarks/data/ui/Makefile.am | 2 +-
extensions/catalogs/Makefile.am | 2 +-
extensions/catalogs/data/ui/Makefile.am | 2 +-
extensions/comments/Makefile.am | 2 +-
extensions/desktop_background/Makefile.am | 2 +-
extensions/edit_metadata/Makefile.am | 2 +-
extensions/edit_metadata/data/ui/Makefile.am | 2 +-
extensions/exiv2/Makefile.am | 2 +-
extensions/exiv2/data/ui/Makefile.am | 2 +-
extensions/file_manager/Makefile.am | 2 +-
extensions/file_tools/Makefile.am | 2 +-
extensions/file_tools/data/ui/Makefile.am | 2 +-
extensions/file_viewer/Makefile.am | 2 +-
extensions/gstreamer/Makefile.am | 2 +-
extensions/gstreamer/data/ui/Makefile.am | 2 +-
extensions/image_print/Makefile.am | 2 +-
extensions/image_print/data/ui/Makefile.am | 2 +-
extensions/image_rotation/Makefile.am | 2 +-
extensions/image_viewer/Makefile.am | 2 +-
extensions/image_viewer/data/ui/Makefile.am | 2 +-
extensions/jpeg_utils/Makefile.am | 2 +-
extensions/list_tools/Makefile.am | 2 +-
extensions/list_tools/data/ui/Makefile.am | 2 +-
extensions/photo_importer/Makefile.am | 2 +-
extensions/photo_importer/data/ui/Makefile.am | 2 +-
extensions/pixbuf_savers/Makefile.am | 2 +-
extensions/pixbuf_savers/data/ui/Makefile.am | 2 +-
extensions/raw_files/Makefile.am | 2 +-
extensions/red_eye_removal/Makefile.am | 2 +-
extensions/red_eye_removal/data/ui/Makefile.am | 2 +-
extensions/rename_series/Makefile.am | 2 +-
extensions/rename_series/data/ui/Makefile.am | 2 +-
extensions/resize_images/Makefile.am | 2 +-
extensions/resize_images/data/ui/Makefile.am | 2 +-
extensions/search/Makefile.am | 2 +-
extensions/search/data/ui/Makefile.am | 2 +-
extensions/slideshow/Makefile.am | 2 +-
extensions/slideshow/data/ui/Makefile.am | 2 +-
gthumb/Makefile.am | 6 +++---
41 files changed, 43 insertions(+), 43 deletions(-)
---
diff --git a/data/ui/Makefile.am b/data/ui/Makefile.am
index 5602caf..7ecb4af 100644
--- a/data/ui/Makefile.am
+++ b/data/ui/Makefile.am
@@ -1,4 +1,4 @@
-uidir = $(datadir)/gthumb-2.0/ui
+uidir = $(pkgdatadir)/ui
ui_DATA = \
extensions.ui \
filter-editor.ui \
diff --git a/extensions/bookmarks/Makefile.am b/extensions/bookmarks/Makefile.am
index c844950..f6f6aa1 100644
--- a/extensions/bookmarks/Makefile.am
+++ b/extensions/bookmarks/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS = data
-extensiondir = $(libdir)/gthumb-2.0/extensions
+extensiondir = $(pkglibdir)/extensions
extension_LTLIBRARIES = libbookmarks.la
libbookmarks_la_SOURCES = \
diff --git a/extensions/bookmarks/data/ui/Makefile.am b/extensions/bookmarks/data/ui/Makefile.am
index 67ae221..7c46184 100644
--- a/extensions/bookmarks/data/ui/Makefile.am
+++ b/extensions/bookmarks/data/ui/Makefile.am
@@ -1,4 +1,4 @@
-uidir = $(datadir)/gthumb-2.0/ui
+uidir = $(pkgdatadir)/ui
ui_DATA = bookmarks.ui
EXTRA_DIST = $(ui_DATA)
diff --git a/extensions/catalogs/Makefile.am b/extensions/catalogs/Makefile.am
index aea69f3..c031da3 100644
--- a/extensions/catalogs/Makefile.am
+++ b/extensions/catalogs/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS = data
-extensiondir = $(libdir)/gthumb-2.0/extensions
+extensiondir = $(pkglibdir)/extensions
extension_LTLIBRARIES = libcatalogs.la
libcatalogs_la_SOURCES = \
diff --git a/extensions/catalogs/data/ui/Makefile.am b/extensions/catalogs/data/ui/Makefile.am
index 52be671..fa47fbd 100644
--- a/extensions/catalogs/data/ui/Makefile.am
+++ b/extensions/catalogs/data/ui/Makefile.am
@@ -1,4 +1,4 @@
-uidir = $(datadir)/gthumb-2.0/ui
+uidir = $(pkgdatadir)/ui
ui_DATA = \
add-to-catalog.ui \
catalog-properties.ui \
diff --git a/extensions/comments/Makefile.am b/extensions/comments/Makefile.am
index c61d896..8e26902 100644
--- a/extensions/comments/Makefile.am
+++ b/extensions/comments/Makefile.am
@@ -1,4 +1,4 @@
-extensiondir = $(libdir)/gthumb-2.0/extensions
+extensiondir = $(pkglibdir)/extensions
extension_LTLIBRARIES = libcomments.la
libcomments_la_SOURCES = \
diff --git a/extensions/desktop_background/Makefile.am b/extensions/desktop_background/Makefile.am
index 5ed7949..f36fc05 100644
--- a/extensions/desktop_background/Makefile.am
+++ b/extensions/desktop_background/Makefile.am
@@ -1,4 +1,4 @@
-extensiondir = $(libdir)/gthumb-2.0/extensions
+extensiondir = $(pkglibdir)/extensions
extension_LTLIBRARIES = libdesktop_background.la
libdesktop_background_la_SOURCES = \
diff --git a/extensions/edit_metadata/Makefile.am b/extensions/edit_metadata/Makefile.am
index 1416fdc..904b301 100644
--- a/extensions/edit_metadata/Makefile.am
+++ b/extensions/edit_metadata/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS = data
-extensiondir = $(libdir)/gthumb-2.0/extensions
+extensiondir = $(pkglibdir)/extensions
extension_LTLIBRARIES = libedit_metadata.la
libedit_metadata_la_SOURCES = \
diff --git a/extensions/edit_metadata/data/ui/Makefile.am b/extensions/edit_metadata/data/ui/Makefile.am
index 981c701..7f637c1 100644
--- a/extensions/edit_metadata/data/ui/Makefile.am
+++ b/extensions/edit_metadata/data/ui/Makefile.am
@@ -1,4 +1,4 @@
-uidir = $(datadir)/gthumb-2.0/ui
+uidir = $(pkgdatadir)/ui
ui_DATA = edit-comment-page.ui
EXTRA_DIST = $(ui_DATA)
diff --git a/extensions/exiv2/Makefile.am b/extensions/exiv2/Makefile.am
index f9b4407..1996c21 100644
--- a/extensions/exiv2/Makefile.am
+++ b/extensions/exiv2/Makefile.am
@@ -2,7 +2,7 @@ if ENABLE_EXIV2
SUBDIRS = data
-extensiondir = $(libdir)/gthumb-2.0/extensions
+extensiondir = $(pkglibdir)/extensions
extension_LTLIBRARIES = libexiv2.la
libexiv2_la_SOURCES = \
diff --git a/extensions/exiv2/data/ui/Makefile.am b/extensions/exiv2/data/ui/Makefile.am
index 4bb8beb..f73969f 100644
--- a/extensions/exiv2/data/ui/Makefile.am
+++ b/extensions/exiv2/data/ui/Makefile.am
@@ -1,4 +1,4 @@
-uidir = $(datadir)/gthumb-2.0/ui
+uidir = $(pkgdatadir)/ui
ui_DATA = edit-exiv2-page.ui
EXTRA_DIST = $(ui_DATA)
diff --git a/extensions/file_manager/Makefile.am b/extensions/file_manager/Makefile.am
index 2b3a347..c544fa9 100644
--- a/extensions/file_manager/Makefile.am
+++ b/extensions/file_manager/Makefile.am
@@ -1,4 +1,4 @@
-extensiondir = $(libdir)/gthumb-2.0/extensions
+extensiondir = $(pkglibdir)/extensions
extension_LTLIBRARIES = libfile_manager.la
libfile_manager_la_SOURCES = \
diff --git a/extensions/file_tools/Makefile.am b/extensions/file_tools/Makefile.am
index 8be77c5..5c46699 100644
--- a/extensions/file_tools/Makefile.am
+++ b/extensions/file_tools/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS = data
-extensiondir = $(libdir)/gthumb-2.0/extensions
+extensiondir = $(pkglibdir)/extensions
extension_LTLIBRARIES = libfile_tools.la
libfile_tools_la_SOURCES = \
diff --git a/extensions/file_tools/data/ui/Makefile.am b/extensions/file_tools/data/ui/Makefile.am
index 2fab922..f3e0877 100644
--- a/extensions/file_tools/data/ui/Makefile.am
+++ b/extensions/file_tools/data/ui/Makefile.am
@@ -1,4 +1,4 @@
-uidir = $(datadir)/gthumb-2.0/ui
+uidir = $(pkgdatadir)/ui
ui_DATA = adjust-colors-options.ui crop-options.ui
EXTRA_DIST = $(ui_DATA)
diff --git a/extensions/file_viewer/Makefile.am b/extensions/file_viewer/Makefile.am
index 12111f3..816b625 100644
--- a/extensions/file_viewer/Makefile.am
+++ b/extensions/file_viewer/Makefile.am
@@ -1,4 +1,4 @@
-extensiondir = $(libdir)/gthumb-2.0/extensions
+extensiondir = $(pkglibdir)/extensions
extension_LTLIBRARIES = libfile_viewer.la
libfile_viewer_la_SOURCES = \
diff --git a/extensions/gstreamer/Makefile.am b/extensions/gstreamer/Makefile.am
index a384cea..a97843a 100644
--- a/extensions/gstreamer/Makefile.am
+++ b/extensions/gstreamer/Makefile.am
@@ -2,7 +2,7 @@ if ENABLE_GSTREAMER
SUBDIRS = data
-extensiondir = $(libdir)/gthumb-2.0/extensions
+extensiondir = $(pkglibdir)/extensions
extension_LTLIBRARIES = libgstreamer.la
libgstreamer_la_SOURCES = \
diff --git a/extensions/gstreamer/data/ui/Makefile.am b/extensions/gstreamer/data/ui/Makefile.am
index e4c55ca..18ee18b 100644
--- a/extensions/gstreamer/data/ui/Makefile.am
+++ b/extensions/gstreamer/data/ui/Makefile.am
@@ -1,4 +1,4 @@
-uidir = $(datadir)/gthumb-2.0/ui
+uidir = $(pkgdatadir)/ui
ui_DATA = mediabar.ui save-screenshot.ui
EXTRA_DIST = $(ui_DATA)
diff --git a/extensions/image_print/Makefile.am b/extensions/image_print/Makefile.am
index 210d133..92c28e5 100644
--- a/extensions/image_print/Makefile.am
+++ b/extensions/image_print/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS = data
-extensiondir = $(libdir)/gthumb-2.0/extensions
+extensiondir = $(pkglibdir)/extensions
extension_LTLIBRARIES = libimage_print.la
libimage_print_la_SOURCES = \
diff --git a/extensions/image_print/data/ui/Makefile.am b/extensions/image_print/data/ui/Makefile.am
index 9b53e7d..7b3e18e 100644
--- a/extensions/image_print/data/ui/Makefile.am
+++ b/extensions/image_print/data/ui/Makefile.am
@@ -1,4 +1,4 @@
-uidir = $(datadir)/gthumb-2.0/ui
+uidir = $(pkgdatadir)/ui
ui_DATA = print-layout.ui
EXTRA_DIST = $(ui_DATA)
diff --git a/extensions/image_rotation/Makefile.am b/extensions/image_rotation/Makefile.am
index 042a113..3abca43 100644
--- a/extensions/image_rotation/Makefile.am
+++ b/extensions/image_rotation/Makefile.am
@@ -1,4 +1,4 @@
-extensiondir = $(libdir)/gthumb-2.0/extensions
+extensiondir = $(pkglibdir)/extensions
extension_LTLIBRARIES = libimage_rotation.la
libimage_rotation_la_SOURCES = \
diff --git a/extensions/image_viewer/Makefile.am b/extensions/image_viewer/Makefile.am
index 4d12205..505d319 100644
--- a/extensions/image_viewer/Makefile.am
+++ b/extensions/image_viewer/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS = data
-extensiondir = $(libdir)/gthumb-2.0/extensions
+extensiondir = $(pkglibdir)/extensions
extension_LTLIBRARIES = libimage_viewer.la
libimage_viewer_la_SOURCES = \
diff --git a/extensions/image_viewer/data/ui/Makefile.am b/extensions/image_viewer/data/ui/Makefile.am
index 21f1e07..a6711df 100644
--- a/extensions/image_viewer/data/ui/Makefile.am
+++ b/extensions/image_viewer/data/ui/Makefile.am
@@ -1,4 +1,4 @@
-uidir = $(datadir)/gthumb-2.0/ui
+uidir = $(pkgdatadir)/ui
ui_DATA = image-viewer-preferences.ui
EXTRA_DIST = $(ui_DATA)
diff --git a/extensions/jpeg_utils/Makefile.am b/extensions/jpeg_utils/Makefile.am
index 720c56c..feb1295 100644
--- a/extensions/jpeg_utils/Makefile.am
+++ b/extensions/jpeg_utils/Makefile.am
@@ -1,4 +1,4 @@
-extensiondir = $(libdir)/gthumb-2.0/extensions
+extensiondir = $(pkglibdir)/extensions
extension_LTLIBRARIES = libjpeg_utils.la
if ENABLE_JPEG_TOOLS
diff --git a/extensions/list_tools/Makefile.am b/extensions/list_tools/Makefile.am
index 835b522..1853e2d 100644
--- a/extensions/list_tools/Makefile.am
+++ b/extensions/list_tools/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS = data
-extensiondir = $(libdir)/gthumb-2.0/extensions
+extensiondir = $(pkglibdir)/extensions
extension_LTLIBRARIES = liblist_tools.la
liblist_tools_la_SOURCES = \
diff --git a/extensions/list_tools/data/ui/Makefile.am b/extensions/list_tools/data/ui/Makefile.am
index 1c03aaa..a1379a1 100644
--- a/extensions/list_tools/data/ui/Makefile.am
+++ b/extensions/list_tools/data/ui/Makefile.am
@@ -1,4 +1,4 @@
-uidir = $(datadir)/gthumb-2.0/ui
+uidir = $(pkgdatadir)/ui
ui_DATA = ask-value.ui personalize-scripts.ui script-editor.ui
EXTRA_DIST = $(ui_DATA)
diff --git a/extensions/photo_importer/Makefile.am b/extensions/photo_importer/Makefile.am
index 647ac36..15d2311 100644
--- a/extensions/photo_importer/Makefile.am
+++ b/extensions/photo_importer/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS = data
-extensiondir = $(libdir)/gthumb-2.0/extensions
+extensiondir = $(pkglibdir)/extensions
extension_LTLIBRARIES = libphoto_importer.la
ENUM_TYPES = \
diff --git a/extensions/photo_importer/data/ui/Makefile.am b/extensions/photo_importer/data/ui/Makefile.am
index 2af04ea..ba1ed63 100644
--- a/extensions/photo_importer/data/ui/Makefile.am
+++ b/extensions/photo_importer/data/ui/Makefile.am
@@ -1,4 +1,4 @@
-uidir = $(datadir)/gthumb-2.0/ui
+uidir = $(pkgdatadir)/ui
ui_DATA = photo-importer.ui
EXTRA_DIST = $(ui_DATA)
diff --git a/extensions/pixbuf_savers/Makefile.am b/extensions/pixbuf_savers/Makefile.am
index f48593c..7b291fe 100644
--- a/extensions/pixbuf_savers/Makefile.am
+++ b/extensions/pixbuf_savers/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS = data
-extensiondir = $(libdir)/gthumb-2.0/extensions
+extensiondir = $(pkglibdir)/extensions
extension_LTLIBRARIES = libpixbuf_savers.la
ENUM_TYPES = \
diff --git a/extensions/pixbuf_savers/data/ui/Makefile.am b/extensions/pixbuf_savers/data/ui/Makefile.am
index cf1d274..f4eede8 100644
--- a/extensions/pixbuf_savers/data/ui/Makefile.am
+++ b/extensions/pixbuf_savers/data/ui/Makefile.am
@@ -1,4 +1,4 @@
-uidir = $(datadir)/gthumb-2.0/ui
+uidir = $(pkgdatadir)/ui
ui_DATA = \
jpeg-options.ui \
png-options.ui \
diff --git a/extensions/raw_files/Makefile.am b/extensions/raw_files/Makefile.am
index cb28096..269f1dd 100644
--- a/extensions/raw_files/Makefile.am
+++ b/extensions/raw_files/Makefile.am
@@ -1,4 +1,4 @@
-extensiondir = $(libdir)/gthumb-2.0/extensions
+extensiondir = $(pkglibdir)/extensions
extension_LTLIBRARIES = libraw_files.la
libraw_files_la_SOURCES = \
diff --git a/extensions/red_eye_removal/Makefile.am b/extensions/red_eye_removal/Makefile.am
index 637d61a..9f537c6 100644
--- a/extensions/red_eye_removal/Makefile.am
+++ b/extensions/red_eye_removal/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS = data
-extensiondir = $(libdir)/gthumb-2.0/extensions
+extensiondir = $(pkglibdir)/extensions
extension_LTLIBRARIES = libred_eye_removal.la
libred_eye_removal_la_SOURCES = \
diff --git a/extensions/red_eye_removal/data/ui/Makefile.am b/extensions/red_eye_removal/data/ui/Makefile.am
index f34bb05..8acb683 100644
--- a/extensions/red_eye_removal/data/ui/Makefile.am
+++ b/extensions/red_eye_removal/data/ui/Makefile.am
@@ -1,4 +1,4 @@
-uidir = $(datadir)/gthumb-2.0/ui
+uidir = $(pkgdatadir)/ui
ui_DATA = red-eye-removal-options.ui
EXTRA_DIST = $(ui_DATA)
diff --git a/extensions/rename_series/Makefile.am b/extensions/rename_series/Makefile.am
index 20bbec5..6f00563 100644
--- a/extensions/rename_series/Makefile.am
+++ b/extensions/rename_series/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS = data
-extensiondir = $(libdir)/gthumb-2.0/extensions
+extensiondir = $(pkglibdir)/extensions
extension_LTLIBRARIES = librename_series.la
librename_series_la_SOURCES = \
diff --git a/extensions/rename_series/data/ui/Makefile.am b/extensions/rename_series/data/ui/Makefile.am
index 8c3718d..b8017c8 100644
--- a/extensions/rename_series/data/ui/Makefile.am
+++ b/extensions/rename_series/data/ui/Makefile.am
@@ -1,4 +1,4 @@
-uidir = $(datadir)/gthumb-2.0/ui
+uidir = $(pkgdatadir)/ui
ui_DATA = rename-series.ui
EXTRA_DIST = $(ui_DATA)
diff --git a/extensions/resize_images/Makefile.am b/extensions/resize_images/Makefile.am
index 93ad055..788b18d 100644
--- a/extensions/resize_images/Makefile.am
+++ b/extensions/resize_images/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS = data
-extensiondir = $(libdir)/gthumb-2.0/extensions
+extensiondir = $(pkglibdir)/extensions
extension_LTLIBRARIES = libresize_images.la
libresize_images_la_SOURCES = \
diff --git a/extensions/resize_images/data/ui/Makefile.am b/extensions/resize_images/data/ui/Makefile.am
index 660fbd7..a12ac76 100644
--- a/extensions/resize_images/data/ui/Makefile.am
+++ b/extensions/resize_images/data/ui/Makefile.am
@@ -1,4 +1,4 @@
-uidir = $(datadir)/gthumb-2.0/ui
+uidir = $(pkgdatadir)/ui
ui_DATA = resize-images.ui
EXTRA_DIST = $(ui_DATA)
diff --git a/extensions/search/Makefile.am b/extensions/search/Makefile.am
index 3c7d688..1a77426 100644
--- a/extensions/search/Makefile.am
+++ b/extensions/search/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS = data
-extensiondir = $(libdir)/gthumb-2.0/extensions
+extensiondir = $(pkglibdir)/extensions
extension_LTLIBRARIES = libsearch.la
libsearch_la_SOURCES = \
diff --git a/extensions/search/data/ui/Makefile.am b/extensions/search/data/ui/Makefile.am
index 6660241..8466064 100644
--- a/extensions/search/data/ui/Makefile.am
+++ b/extensions/search/data/ui/Makefile.am
@@ -1,4 +1,4 @@
-uidir = $(datadir)/gthumb-2.0/ui
+uidir = $(pkgdatadir)/ui
ui_DATA = search-editor.ui
EXTRA_DIST = $(ui_DATA)
diff --git a/extensions/slideshow/Makefile.am b/extensions/slideshow/Makefile.am
index eb1aa94..1033f5c 100644
--- a/extensions/slideshow/Makefile.am
+++ b/extensions/slideshow/Makefile.am
@@ -2,7 +2,7 @@ if ENABLE_CLUTTER
SUBDIRS = data
-extensiondir = $(libdir)/gthumb-2.0/extensions
+extensiondir = $(pkglibdir)/extensions
extension_LTLIBRARIES = libslideshow.la
libslideshow_la_SOURCES = \
diff --git a/extensions/slideshow/data/ui/Makefile.am b/extensions/slideshow/data/ui/Makefile.am
index 4263369..6a189b4 100644
--- a/extensions/slideshow/data/ui/Makefile.am
+++ b/extensions/slideshow/data/ui/Makefile.am
@@ -1,4 +1,4 @@
-uidir = $(datadir)/gthumb-2.0/ui
+uidir = $(pkgdatadir)/ui
ui_DATA = slideshow-preferences.ui
EXTRA_DIST = $(ui_DATA)
diff --git a/gthumb/Makefile.am b/gthumb/Makefile.am
index 3ad027b..d2bc092 100644
--- a/gthumb/Makefile.am
+++ b/gthumb/Makefile.am
@@ -246,9 +246,9 @@ ui_dir = $(abs_top_srcdir)/data/ui
extensions_ui_dir = $(abs_top_srcdir)/extensions
extensions_dir = $(abs_top_builddir)/extensions
else
-ui_dir = $(datadir)/gthumb-2.0/ui
-extensions_ui_dir = $(datadir)/gthumb-2.0/ui
-extensions_dir = $(libdir)/gthumb-2.0/extensions
+ui_dir = $(pkgdatadir)/ui
+extensions_ui_dir = $(pkgdatadir)/ui
+extensions_dir = $(pkglibdir)/extensions
endif
gthumb_CFLAGS = \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]