Revision: 1793
http://geeqie.svn.sourceforge.net/geeqie/?rev=1793&view=rev
Author: nadvornik
Date: 2009-07-01 20:55:37 +0000 (Wed, 01 Jul 2009)
Log Message:
-----------
make sure that automake and config.h uses the same installation paths
Modified Paths:
--------------
trunk/configure.in
trunk/geeqie.spec.in
trunk/plugins/Makefile.am
trunk/plugins/import/Makefile.am
trunk/plugins/rotate/Makefile.am
trunk/plugins/symlink/Makefile.am
trunk/plugins/ufraw/Makefile.am
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2009-07-01 19:38:17 UTC (rev 1792)
+++ trunk/configure.in 2009-07-01 20:55:37 UTC (rev 1793)
@@ -223,9 +223,11 @@
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
# ----------------------------------------------------------------------
Modified: trunk/geeqie.spec.in
===================================================================
--- trunk/geeqie.spec.in 2009-07-01 19:38:17 UTC (rev 1792)
+++ trunk/geeqie.spec.in 2009-07-01 20:55:37 UTC (rev 1793)
@@ -100,5 +100,5 @@
%{_datadir}/applications/geeqie.desktop
%{_datadir}/pixmaps/geeqie.png
%{_mandir}/man1/geeqie*
-%{_libdir}/geeqie
+%{_prefix}/lib/geeqie
Modified: trunk/plugins/Makefile.am
===================================================================
--- trunk/plugins/Makefile.am 2009-07-01 19:38:17 UTC (rev 1792)
+++ trunk/plugins/Makefile.am 2009-07-01 20:55:37 UTC (rev 1793)
@@ -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)
Modified: trunk/plugins/import/Makefile.am
===================================================================
--- trunk/plugins/import/Makefile.am 2009-07-01 19:38:17 UTC (rev 1792)
+++ trunk/plugins/import/Makefile.am 2009-07-01 20:55:37 UTC (rev 1793)
@@ -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@
Modified: trunk/plugins/rotate/Makefile.am
===================================================================
--- trunk/plugins/rotate/Makefile.am 2009-07-01 19:38:17 UTC (rev 1792)
+++ trunk/plugins/rotate/Makefile.am 2009-07-01 20:55:37 UTC (rev 1793)
@@ -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@
Modified: trunk/plugins/symlink/Makefile.am
===================================================================
--- trunk/plugins/symlink/Makefile.am 2009-07-01 19:38:17 UTC (rev 1792)
+++ trunk/plugins/symlink/Makefile.am 2009-07-01 20:55:37 UTC (rev 1793)
@@ -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@
Modified: trunk/plugins/ufraw/Makefile.am
===================================================================
--- trunk/plugins/ufraw/Makefile.am 2009-07-01 19:38:17 UTC (rev 1792)
+++ trunk/plugins/ufraw/Makefile.am 2009-07-01 20:55:37 UTC (rev 1793)
@@ -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
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
Geeqie-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/geeqie-svn
