make sure that automake and config.h uses the same installation paths

diff --git a/configure.in b/configure.in
index 09045a7..40fbc5b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -223,9 +223,11 @@ AC_SUBST(htmldir)
 
 eval "eval appdir=${datadir}/${PACKAGE}"
 AC_DEFINE_UNQUOTED([GQ_APP_DIR], "$appdir", [Location of application data])
+AC_SUBST(appdir)
 
 eval "eval gq_bindir=${prefix}/lib/${PACKAGE}"
 AC_DEFINE_UNQUOTED([GQ_BIN_DIR], "$gq_bindir", [Location of helper scripts and executables])
+AC_SUBST(gq_bindir)
 
 #  LIRC support
 # ----------------------------------------------------------------------

diff --git a/geeqie.spec.in b/geeqie.spec.in
index f4db107..27c6f5a 100644 (file)
--- a/geeqie.spec.in
+++ b/geeqie.spec.in
@@ -100,5 +100,5 @@ make install DESTDIR=%{buildroot}
 %{_datadir}/applications/geeqie.desktop
 %{_datadir}/pixmaps/geeqie.png
 %{_mandir}/man1/geeqie*
-%{_libdir}/geeqie
+%{_prefix}/lib/geeqie
 

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 53eac9f..3f6495c 100644 (file)
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,7 +1,7 @@
 #FIXME enable or disable individual plugins from configure
 
 SUBDIRS = rotate symlink ufraw import
-qq_desktoptemplatedir = $(pkgdatadir)
+qq_desktoptemplatedir = $(appdir)
 qq_desktoptemplate_DATA = template.desktop
 
 EXTRA_DIST = $(qq_desktoptemplate_DATA)

diff --git a/plugins/import/Makefile.am b/plugins/import/Makefile.am
index b747905..e003c5a 100644 (file)
--- a/plugins/import/Makefile.am
+++ b/plugins/import/Makefile.am
@@ -1,6 +1,6 @@
-dist_pkglib_SCRIPTS = geeqie-import
+dist_gq_bin_SCRIPTS = geeqie-import
 
-gq_desktopdir = $(pkgdatadir)/applications
+gq_desktopdir = $(appdir)/applications
 gq_desktop_in_files = geeqie-import-geeqie.desktop.in geeqie-import-gqview.desktop.in
 gq_desktop_DATA = $(gq_desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@

diff --git a/plugins/rotate/Makefile.am b/plugins/rotate/Makefile.am
index 5f0ff83..8fd4372 100644 (file)
--- a/plugins/rotate/Makefile.am
+++ b/plugins/rotate/Makefile.am
@@ -1,6 +1,6 @@
-dist_pkglib_SCRIPTS = geeqie-rotate
+dist_gq_bin_SCRIPTS = geeqie-rotate
 
-gq_desktopdir = $(pkgdatadir)/applications
+gq_desktopdir = $(appdir)/applications
 gq_desktop_in_files = rotate.desktop.in
 gq_desktop_DATA = $(gq_desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@

diff --git a/plugins/symlink/Makefile.am b/plugins/symlink/Makefile.am
index 487f844..d783c20 100644 (file)
--- a/plugins/symlink/Makefile.am
+++ b/plugins/symlink/Makefile.am
@@ -1,6 +1,6 @@
-dist_pkglib_SCRIPTS = geeqie-symlink
+dist_gq_bin_SCRIPTS = geeqie-symlink
 
-gq_desktopdir = $(pkgdatadir)/applications
+gq_desktopdir = $(appdir)/applications
 gq_desktop_in_files = symlink.desktop.in
 gq_desktop_DATA = $(gq_desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@

diff --git a/plugins/ufraw/Makefile.am b/plugins/ufraw/Makefile.am
index 74e78b9..2317a06 100644 (file)
--- a/plugins/ufraw/Makefile.am
+++ b/plugins/ufraw/Makefile.am
@@ -1,6 +1,6 @@
-dist_pkglib_SCRIPTS = geeqie-ufraw
+dist_gq_bin_SCRIPTS = geeqie-ufraw
 
-gq_desktopdir = $(pkgdatadir)/applications
+gq_desktopdir = $(appdir)/applications
 gq_desktop_in_files = geeqie-ufraw-recursive.desktop.in \
                       geeqie-ufraw.desktop.in \
                       geeqie-ufraw-id.desktop.in