Author: Jan Vcelak <jvcelak@redhat.com> Related: bz#468102 Fixes 'groffer' tool which didn't work at all. Groffer libraries (scripts) are in non-default location on Fedora. This patch fixes this issues. Also an unwanted variable expansion was present in groffer2.sh. diff -u -urp groff-1.18.1.4/contrib/groffer/groffer.sh groff-1.18.1.4.fixed/contrib/groffer/groffer.sh --- groff-1.18.1.4/contrib/groffer/groffer.sh 2006-10-04 22:35:39.000000000 +0200 +++ groff-1.18.1.4.fixed/contrib/groffer/groffer.sh 2010-04-06 13:05:09.393197112 +0200 @@ -109,7 +109,7 @@ no) */) :; ;; *) _AT_LIBDIR_AT="${_AT_LIBDIR_AT}/"; esac; - _GROFFER_LIBDIR="${_AT_LIBDIR_AT}"'groff/groffer/'; + _GROFFER_LIBDIR="${_AT_LIBDIR_AT}"'groff/@VERSION@/groffer/'; ;; esac; diff -u -urp groff-1.18.1.4/contrib/groffer/groffer2.sh groff-1.18.1.4.fixed/contrib/groffer/groffer2.sh --- groff-1.18.1.4/contrib/groffer/groffer2.sh 2006-10-05 20:44:08.000000000 +0200 +++ groff-1.18.1.4.fixed/contrib/groffer/groffer2.sh 2010-04-06 15:45:44.131323506 +0200 @@ -4616,7 +4616,7 @@ usage() func_check usage = 0 "$@"; echo; version; - cat <<EOF + cat <<"EOF" Usage: groffer [option]... [filespec]... diff -u -urp groff-1.18.1.4/contrib/groffer/Makefile.sub groff-1.18.1.4.fixed/contrib/groffer/Makefile.sub --- groff-1.18.1.4/contrib/groffer/Makefile.sub 2006-10-14 14:30:46.000000000 +0200 +++ groff-1.18.1.4.fixed/contrib/groffer/Makefile.sub 2010-04-06 13:05:09.393197112 +0200 @@ -48,20 +48,20 @@ install_data: groffer -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir) -$(RM) $(DESTDIR)$(bindir)/groffer $(INSTALL_SCRIPT) groffer $(DESTDIR)$(bindir)/groffer - -test -d $(DESTDIR)$(libdir)/groff/groffer || \ - $(mkinstalldirs) $(DESTDIR)$(libdir)/groff/groffer - -$(RM) $(DESTDIR)$(libdir)/groff/groffer/groffer2.sh + -test -d $(DESTDIR)$(libdir)/groff/$(version)$(revision)/groffer || \ + $(mkinstalldirs) $(DESTDIR)$(libdir)/groff/$(version)$(revision)/groffer + -$(RM) $(DESTDIR)$(libdir)/groff/$(version)$(revision)/groffer/groffer2.sh $(INSTALL_SCRIPT) $(srcdir)/groffer2.sh \ - $(DESTDIR)$(libdir)/groff/groffer/groffer2.sh - -$(RM) $(DESTDIR)$(libdir)/groff/groffer/version.sh + $(DESTDIR)$(libdir)/groff/$(version)$(revision)/groffer/groffer2.sh + -$(RM) $(DESTDIR)$(libdir)/groff/$(version)$(revision)/groffer/version.sh $(INSTALL_DATA) $(srcdir)/version.sh \ - $(DESTDIR)$(libdir)/groff/groffer/version.sh + $(DESTDIR)$(libdir)/groff/$(version)$(revision)/groffer/version.sh uninstall_sub: -$(RM) $(DESTDIR)$(bindir)/groffer - -$(RM) $(DESTDIR)$(libdir)/groff/groffer/groffer2.sh - -$(RM) $(DESTDIR)$(libdir)/groff/groffer/version.sh - -rmdir $(DESTDIR)$(libdir)/groff/groffer + -$(RM) $(DESTDIR)$(libdir)/groff/$(version)$(revision)/groffer/groffer2.sh + -$(RM) $(DESTDIR)$(libdir)/groff/$(version)$(revision)/groffer/version.sh + -rmdir $(DESTDIR)$(libdir)/groff/$(version)$(revision)/groffer ######################################################################## # Emacs settings