bwarken pushed a commit to branch master
in repository groff.

commit 83e59ba60e204c03c6c2c5ab54b70ceaede953cf
Author: Bernd Warken <[email protected]>
Date:   Tue Feb 25 18:58:35 2014 +0100

    fix source location, when run before make
---
 contrib/groffer/ChangeLog  |    4 ++++
 contrib/groffer/groffer.pl |   12 +++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/contrib/groffer/ChangeLog b/contrib/groffer/ChangeLog
index 7dff915..3e67128 100644
--- a/contrib/groffer/ChangeLog
+++ b/contrib/groffer/ChangeLog
@@ -1,5 +1,9 @@
 2014-02-25  Bernd Warken  <[email protected]>
 
+       * groffer.pl: fix source location, when run before `make'
+
+2014-02-25  Bernd Warken  <[email protected]>
+
        * groffer.man: replace .copyleft by .co
 
 2014-02-25  Bernd Warken  <[email protected]>
diff --git a/contrib/groffer/groffer.pl b/contrib/groffer/groffer.pl
index 5269edb..e090654 100755
--- a/contrib/groffer/groffer.pl
+++ b/contrib/groffer/groffer.pl
@@ -117,16 +117,14 @@ my $file_perl_test_pl;
 my $groffer_libdir;
 
 if ($before_make) {
-  my $groffer_perl_dir = $FindBin::Bin;
-  my $groffer_top_dir = File::Spec->catdir($groffer_perl_dir, '..');
-  $groffer_top_dir = Cwd::realpath($groffer_top_dir);
-  $at_at{'BINDIR'} = $groffer_perl_dir;
+  my $groffer_source_dir = $FindBin::Bin;
+  $at_at{'BINDIR'} = $groffer_source_dir;
   $at_at{'G'} = '';
   $at_at{'LIBDIR'} = '';
-  $groffer_libdir = $groffer_perl_dir;
-  $file_perl_test_pl = File::Spec->catfile($groffer_perl_dir,
+  $groffer_libdir = $groffer_source_dir;
+  $file_perl_test_pl = File::Spec->catfile($groffer_source_dir,
                                               'perl_test.pl');
-  $File_version_sh = File::Spec->catfile($groffer_top_dir, 'version.sh');
+  $File_version_sh = File::Spec->catfile($groffer_source_dir, 'version.sh');
   $Groff_Version = '';
 } else {
   $Groff_Version = '@VERSION@';

_______________________________________________
Groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit

Reply via email to