[libmarpa-r2-perl] 09/14: Work on Github issue #139

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag Marpa-R2-2.085_006
in repository libmarpa-r2-perl.

commit 5743f2e1e62f0f19a73165887391a66ce1f0971d
Author: Jeffrey Kegler <JKEGL at cpan.org>
Date:   Fri May 2 19:32:10 2014 -0700

    Work on Github issue #139
---
 cpan/MANIFEST                                       | 6 +++---
 cpan/inc/Marpa/R2/Build_Me.pm                       | 4 ++--
 cpan/libmarpa/Makefile                              | 1 +
 cpan/libmarpa/ac/Makefile.am                        | 2 +-
 cpan/libmarpa/ac/configure.ac                       | 2 +-
 cpan/libmarpa/bin/to_stage.pl                       | 2 +-
 cpan/libmarpa/public/{VERSION.in => LIB_VERSION.in} | 0
 7 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/cpan/MANIFEST b/cpan/MANIFEST
index eb73427..be3083b 100644
--- a/cpan/MANIFEST
+++ b/cpan/MANIFEST
@@ -155,7 +155,7 @@ libmarpa/obs/marpa_obs.c
 libmarpa/obs/marpa_obs.h
 libmarpa/public/.gitignore
 libmarpa/public/Makefile
-libmarpa/public/VERSION.in
+libmarpa/public/LIB_VERSION.in
 libmarpa/public/marpa.h-version
 libmarpa/public/marpa.h.p10
 libmarpa/public/marpa.h.p90
@@ -195,8 +195,8 @@ libmarpa_dist/Makefile.in
 libmarpa_dist/Makefile.win32
 libmarpa_dist/NEWS
 libmarpa_dist/README
-libmarpa_dist/VERSION
-libmarpa_dist/VERSION.in
+libmarpa_dist/LIB_VERSION
+libmarpa_dist/LIB_VERSION.in
 libmarpa_dist/aclocal.m4
 libmarpa_dist/config.guess
 libmarpa_dist/config.h.in
diff --git a/cpan/inc/Marpa/R2/Build_Me.pm b/cpan/inc/Marpa/R2/Build_Me.pm
index 1988ed8..9af2c4e 100644
--- a/cpan/inc/Marpa/R2/Build_Me.pm
+++ b/cpan/inc/Marpa/R2/Build_Me.pm
@@ -303,7 +303,7 @@ sub process_xs {
         }
         push @extra_linker_flags, '-L' . $libmarpa_libs_dir;
         my $version_file_name =
-            File::Spec->catfile( $libmarpa_build_directory, 'VERSION' );
+            File::Spec->catfile( $libmarpa_build_directory, 'LIB_VERSION' );
         my $libmarpa_version = $self->file_slurp($version_file_name);
         chomp $libmarpa_version;
         my @libmarpa_version = split /[.]/xms, $libmarpa_version;
@@ -509,7 +509,7 @@ sub do_libmarpa {
         
     # As of this writing, only used by Config::AutoConf logic,
     # but that may change.
-    my $libmarpa_version = $self->file_slurp('VERSION');
+    my $libmarpa_version = $self->file_slurp('LIB_VERSION');
     chomp $libmarpa_version;
     my @libmarpa_version = split /[.]/xms, $libmarpa_version;
 
diff --git a/cpan/libmarpa/Makefile b/cpan/libmarpa/Makefile
index 69588f2..a77e956 100644
--- a/cpan/libmarpa/Makefile
+++ b/cpan/libmarpa/Makefile
@@ -51,6 +51,7 @@ sources:
 
 clean:
 	for d in $(CLEANABLE_DIR); do (cd $$d; make clean); done
+	rm -rf stage
 
 stage/stamp-h1: stage/Makefile stage_copy
 	(cd stage; make dist)
diff --git a/cpan/libmarpa/ac/Makefile.am b/cpan/libmarpa/ac/Makefile.am
index bbfe039..0984a12 100644
--- a/cpan/libmarpa/ac/Makefile.am
+++ b/cpan/libmarpa/ac/Makefile.am
@@ -26,7 +26,7 @@ libmarpa_la_SOURCES = marpa.c marpa.h \
     marpa_tavl.c marpa_tavl.h \
     marpa_ami.c marpa_ami.h \
     marpa_codes.c marpa_slif.c
-EXTRA_DIST = VERSION \
+EXTRA_DIST = LIB_VERSION \
   win32/marpa.def Makefile.win32 win32/do_config_h.pl \
   notes/shared_test.txt
 libmarpa_la_LIBADD = $(LIBOBJS)
diff --git a/cpan/libmarpa/ac/configure.ac b/cpan/libmarpa/ac/configure.ac
index 40e6044..b38dfa3 100644
--- a/cpan/libmarpa/ac/configure.ac
+++ b/cpan/libmarpa/ac/configure.ac
@@ -131,7 +131,7 @@ fi
 # The following were suggested by autoscan
 AC_CHECK_FUNCS([memset])
 
-AC_CONFIG_FILES( [Makefile VERSION])
+AC_CONFIG_FILES( [Makefile LIB_VERSION])
 AC_OUTPUT
 
 # vim: expandtab shiftwidth=4:
diff --git a/cpan/libmarpa/bin/to_stage.pl b/cpan/libmarpa/bin/to_stage.pl
index 570182d..db29793 100644
--- a/cpan/libmarpa/bin/to_stage.pl
+++ b/cpan/libmarpa/bin/to_stage.pl
@@ -75,7 +75,7 @@ stage/COPYING.LESSER: ac/COPYING.LESSER
 stage/ChangeLog: ac/ChangeLog
 stage/NEWS: ac/NEWS
 stage/README: ac/README
-stage/VERSION.in: public/VERSION.in
+stage/LIB_VERSION.in: public/LIB_VERSION.in
 doc/README: ac_doc/README
 doc/NEWS: ac_doc/NEWS
 doc/AUTHORS: ac_doc/AUTHORS
diff --git a/cpan/libmarpa/public/VERSION.in b/cpan/libmarpa/public/LIB_VERSION.in
similarity index 100%
rename from cpan/libmarpa/public/VERSION.in
rename to cpan/libmarpa/public/LIB_VERSION.in

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libmarpa-r2-perl.git