fixed instalation of doc files

diff --git a/Makefile.am b/Makefile.am
index bcfe421..88252b9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ DIST_SUBDIRS = src po doc
 
 man_MANS = geeqie.1
 
-readmedir = $(datadir)/doc/geeqie-$(VERSION)
+readmedir = @readmedir@
 readme_DATA = README COPYING ChangeLog TODO
 
 desktopdir = $(datadir)/applications

diff --git a/configure.in b/configure.in
index d263897..1a318dc 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -21,8 +21,16 @@ fi
 AM_PATH_GTK_2_0(2.4.0,,AC_MSG_ERROR(GTK+ >= 2.4.0 not installed.))
 AC_PATH_PROGS(GDK_PIXBUF_CSOURCE, "gdk-pixbuf-csource")
 
-AC_DEFINE_UNQUOTED(GQ_HELPDIR, "$prefix/share/doc/geeqie-$VERSION", [Location of documentation files])
-AC_DEFINE_UNQUOTED(GQ_HTMLDIR, "$prefix/share/doc/geeqie-$VERSION/html", [Location of html documentation])
+AC_ARG_WITH(readmedir, [  --with-readmedir=DIR    install path for readme files],
+            readmedir=$withval, readmedir="$prefix/share/doc/geeqie-$VERSION")
+AC_ARG_WITH(htmldir, [  --with-htmldir=DIR      install path for html files],
+            htmldir=$withval, htmldir="$readmedir/html")
+
+AC_DEFINE_UNQUOTED(GQ_HELPDIR, "$readmedir", [Location of documentation files])
+AC_DEFINE_UNQUOTED(GQ_HTMLDIR, "$htmldir", [Location of html documentation])
+
+AC_SUBST(readmedir)
+AC_SUBST(htmldir)
 
 dnl checks for functions
 AC_CHECK_FUNCS(strverscmp access fsync fflush)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 57d0d23..6e79b35 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in.
 
-helpdir = $(datadir)/doc/geeqie-$(VERSION)/html
+helpdir = @htmldir@
 help_DATA = \
        gnu_fdl.txt     \
        gqview_faq.html \

diff --git a/geeqie.spec.in b/geeqie.spec.in
index 36a5f47..4603b7c 100644 (file)
--- a/geeqie.spec.in
+++ b/geeqie.spec.in
@@ -3,6 +3,7 @@
 BuildRequires:  gtk2-devel gcc-c++
 %if 0%{?suse_version}
 BuildRequires:  liblcms-devel
+%define docname        %{name}
 %if %suse_version < 1030
 %define _prefix            /opt/gnome
 %define _sysconfdir /etc%{prefix}
@@ -11,6 +12,7 @@ BuildRequires:  liblcms-devel
 %endif
 %else
 BuildRequires:  lcms-devel
+%define docname        %{name}-%{version}
 %endif
 %if 0%{?suse_version} > 1010
 BuildRequires:  libexiv2-devel
@@ -65,25 +67,22 @@ Supporta anche l'uso di editor grafici esterni.
 %setup -q
 
 %build
-%configure
+%configure --with-readmedir="%{_docdir}/%{docname}"
 
-%__make %{?jobs:-j%{jobs}} \
-       helpdir="%{_docdir}/%{name}/html" \
-       readmedir="%{_docdir}/%{name}"
+
+%__make %{?jobs:-j%{jobs}}
 
 %install
-make install DESTDIR=%{buildroot} \
-     helpdir="%{_docdir}/%{name}/html" \
-     readmedir="%{_docdir}/%{name}"
+make install DESTDIR=%{buildroot}
 
-%__install AUTHORS COPYING ChangeLog NEWS README "%{buildroot}/%{_docdir}/%{name}/"
+%__install AUTHORS COPYING ChangeLog NEWS README "%{buildroot}/%{_docdir}/%{docname}/"
 
 %clean
 %__rm -rf "%{buildroot}"
 
 %files 
 %defattr(-,root,root)
-%doc %{_docdir}/%{name}
+%doc %{_docdir}/%{docname}
 %{_bindir}/geeqie
 %{_datadir}/locale/*/LC_MESSAGES/*.mo
 %{_datadir}/applications/geeqie.desktop