Mercurial > geeqie
changeset 1694:22ec11cc989c
make sure that automake and config.h uses the same installation paths
| author | nadvornik |
|---|---|
| date | Wed, 01 Jul 2009 20:55:37 +0000 |
| parents | 2bde6a55001a |
| children | 6f7c6ae09ee7 |
| files | configure.in geeqie.spec.in plugins/Makefile.am plugins/import/Makefile.am plugins/rotate/Makefile.am plugins/symlink/Makefile.am plugins/ufraw/Makefile.am |
| diffstat | 7 files changed, 12 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.in Wed Jul 01 19:38:17 2009 +0000 +++ b/configure.in Wed Jul 01 20:55:37 2009 +0000 @@ -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 # ----------------------------------------------------------------------
--- a/geeqie.spec.in Wed Jul 01 19:38:17 2009 +0000 +++ b/geeqie.spec.in Wed Jul 01 20:55:37 2009 +0000 @@ -100,5 +100,5 @@ %{_datadir}/applications/geeqie.desktop %{_datadir}/pixmaps/geeqie.png %{_mandir}/man1/geeqie* -%{_libdir}/geeqie +%{_prefix}/lib/geeqie
--- a/plugins/Makefile.am Wed Jul 01 19:38:17 2009 +0000 +++ b/plugins/Makefile.am Wed Jul 01 20:55:37 2009 +0000 @@ -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)
--- a/plugins/import/Makefile.am Wed Jul 01 19:38:17 2009 +0000 +++ b/plugins/import/Makefile.am Wed Jul 01 20:55:37 2009 +0000 @@ -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@
--- a/plugins/rotate/Makefile.am Wed Jul 01 19:38:17 2009 +0000 +++ b/plugins/rotate/Makefile.am Wed Jul 01 20:55:37 2009 +0000 @@ -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@
--- a/plugins/symlink/Makefile.am Wed Jul 01 19:38:17 2009 +0000 +++ b/plugins/symlink/Makefile.am Wed Jul 01 20:55:37 2009 +0000 @@ -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@
--- a/plugins/ufraw/Makefile.am Wed Jul 01 19:38:17 2009 +0000 +++ b/plugins/ufraw/Makefile.am Wed Jul 01 20:55:37 2009 +0000 @@ -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