diff options
Diffstat (limited to 'contrib/groffer')
| -rw-r--r-- | contrib/groffer/ChangeLog | 9 | ||||
| -rw-r--r-- | contrib/groffer/Makefile.sub | 4 | ||||
| -rwxr-xr-x | contrib/groffer/perl/groffer.pl | 3 |
3 files changed, 12 insertions, 4 deletions
diff --git a/contrib/groffer/ChangeLog b/contrib/groffer/ChangeLog index d881fd62..342b0250 100644 --- a/contrib/groffer/ChangeLog +++ b/contrib/groffer/ChangeLog @@ -1,3 +1,12 @@ +2011-03-21 Jan Vcelak <jvcelak@redhat.com> + Bernd Warken + + Remove hardcoded path to 'libdir/groff/groffer' directory. + + * Makefile.sub: use @groffer_dir@ + + * groffer.pl: use @groffer_dir@ + 2011-01-27 James Budiono <james.budiono@gmail.com> Bernd Warken diff --git a/contrib/groffer/Makefile.sub b/contrib/groffer/Makefile.sub index 6d2666be..bc962a28 100644 --- a/contrib/groffer/Makefile.sub +++ b/contrib/groffer/Makefile.sub @@ -63,8 +63,6 @@ GROFFER_REST=$(srcdir)/roff2.man \ GROFFER_PERL_=`echo $(GROFFER_PERL) | sed 's|$(srcdir)/perl/||g'` GROFFER_SHELL_=`echo $(GROFFER_SHELL) | sed 's|$(srcdir)/shell||g'` -groffer_dir=$(libdir)/groff/groffer - # TODO: Add perl check to configure script. groffer: $(GROFFER_PERL) $(GROFFER_SHELL) \ $(GROFFER_REST) $(SH_DEPS_SED_SCRIPT) @@ -75,6 +73,7 @@ groffer: $(GROFFER_PERL) $(GROFFER_SHELL) \ -e "s|@g@|$(g)|g" \ -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \ -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \ + -e "s|@groffer_dir@|$(DESTDIR)$(groffer_dir)|g" \ -e "s|@VERSION@|$(version)$(revision)|g" \ -e "$(SH_SCRIPT_SED_CMD)" \ $(srcdir)/perl/groffer.pl >$@; \ @@ -89,6 +88,7 @@ groffer: $(GROFFER_PERL) $(GROFFER_SHELL) \ -e "s|@g@|$(g)|g" \ -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \ -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \ + -e "s|@groffer_dir@|$(DESTDIR)$(groffer_dir)|g" \ -e "s|@VERSION@|$(version)$(revision)|g" \ -e "$(SH_SCRIPT_SED_CMD)" \ $(srcdir)/shell/groffer.sh >$@; \ diff --git a/contrib/groffer/perl/groffer.pl b/contrib/groffer/perl/groffer.pl index 5254dcd8..9805fcf6 100755 --- a/contrib/groffer/perl/groffer.pl +++ b/contrib/groffer/perl/groffer.pl @@ -132,8 +132,7 @@ BEGIN { $at_at{'BINDIR'} = '@BINDIR@'; $at_at{'G'} = '@g@'; $at_at{'LIBDIR'} = '@libdir@'; - $groffer_libdir = - File::Spec->catdir($at_at{'LIBDIR'}, 'groff', 'groffer'); + $groffer_libdir = '@groffer_dir@'; $file_perl_test_pl = File::Spec->catfile($groffer_libdir, 'perl_test.pl'); $File_version_sh = File::Spec->catfile($groffer_libdir, 'version.sh'); |