perl: avoid *.pmc and fix Error.pm further

The previous round tried to use *.pmc files but it confused RPM
dependency analysis on some distros.  Install them as plain
vanilla *.pm files instead.

Also "local @_" construct did not properly work when goto &sub
is used until recent versions of Perl.  Avoid it (and we do not
need to localize it here anyway).

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Makefile b/Makefile
index ba6607b7e766f0e9a7dc8d5a6d11dabb15d692bf..5c73cd208aaab4ce0a88abd636956e462e161a43 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2274,14 +2274,14 @@ endif
 po/build/locale/%/LC_MESSAGES/git.mo: po/%.po
        $(QUIET_MSGFMT)mkdir -p $(dir $@) && $(MSGFMT) -o $@ $<
 
 po/build/locale/%/LC_MESSAGES/git.mo: po/%.po
        $(QUIET_MSGFMT)mkdir -p $(dir $@) && $(MSGFMT) -o $@ $<
 

-PMFILES := $(wildcard perl/*.pm perl/*/*.pm perl/*/*/*.pm perl/*/*/*/*.pm)
-PMCFILES := $(patsubst perl/%.pm,perl/build/lib/%.pmc,$(PMFILES))
+LIB_PERL := $(wildcard perl/Git.pm perl/Git/*.pm perl/Git/*/*.pm perl/Git/*/*/*.pm)
+LIB_PERL_GEN := $(patsubst perl/%.pm,perl/build/lib/%.pm,$(LIB_PERL))

 
 ifndef NO_PERL
 
 ifndef NO_PERL

-all:: $(PMCFILES)
+all:: $(LIB_PERL_GEN)

 endif
 
 endif
 

-perl/build/lib/%.pmc: perl/%.pm
+perl/build/lib/%.pm: perl/%.pm

        $(QUIET_GEN)mkdir -p $(dir $@) && \
        sed -e 's|@@LOCALEDIR@@|$(localedir_SQ)|g' < $< > $@
 
        $(QUIET_GEN)mkdir -p $(dir $@) && \
        sed -e 's|@@LOCALEDIR@@|$(localedir_SQ)|g' < $< > $@
 

diff --git a/perl/Git/Error.pm b/perl/Git/Error.pm
index 5874672150697c2a978f6327d6b60077bfadac5d..09bbc9739096f9e5c9b26e8f24d9836329891bf3 100644 (file)
--- a/perl/Git/Error.pm
+++ b/perl/Git/Error.pm
@@ -39,7 +39,7 @@ sub import {
        require Error;
     };
 
        require Error;
     };
 

-    local @_ = ($caller, @_);
+    unshift @_, $caller;

     goto &Error::import;
 }
 
     goto &Error::import;
 }