Merge branch 'sb/send-email-reconfirm-fix' into maint

[git.git] / perl / Makefile

diff --git a/perl/Makefile b/perl/Makefile
index fe7a48646412b872d8db09bdef70de751399cad6..15d96fcc7a5a81ae0304bc51a603fe54bcbb95c6 100644 (file)
--- a/perl/Makefile
+++ b/perl/Makefile
@@ -20,36 +20,57 @@ clean:
        $(RM) ppport.h
        $(RM) $(makfile)
        $(RM) $(makfile).old
+       $(RM) PM.stamp
+
+$(makfile): PM.stamp
 
 ifdef NO_PERL_MAKEMAKER
 instdir_SQ = $(subst ','\'',$(prefix)/lib)
 
 modules += Git
 modules += Git/I18N
+modules += Git/IndexInfo
+modules += Git/SVN
 modules += Git/SVN/Memoize/YAML
 modules += Git/SVN/Fetcher
 modules += Git/SVN/Editor
+modules += Git/SVN/GlobSpec
+modules += Git/SVN/Log
+modules += Git/SVN/Migration
 modules += Git/SVN/Prompt
 modules += Git/SVN/Ra
+modules += Git/SVN/Utils
 
 $(makfile): ../GIT-CFLAGS Makefile
        echo all: private-Error.pm Git.pm Git/I18N.pm > $@
-       echo '  mkdir -p blib/lib/Git/SVN/Memoize' >> $@
        set -e; \
        for i in $(modules); \
        do \
+               if test $$i = $${i%/*}; \
+               then \
+                       subdir=; \
+               else \
+                       subdir=/$${i%/*}; \
+               fi; \
                echo '  $(RM) blib/lib/'$$i'.pm' >> $@; \
+               echo '  mkdir -p blib/lib'$$subdir >> $@; \
                echo '  cp '$$i'.pm blib/lib/'$$i'.pm' >> $@; \
        done
        echo '  $(RM) blib/lib/Error.pm' >> $@
        '$(PERL_PATH_SQ)' -MError -e 'exit($$Error::VERSION < 0.15009)' || \
        echo '  cp private-Error.pm blib/lib/Error.pm' >> $@
        echo install: >> $@
-       echo '  mkdir -p "$$(DESTDIR)$(instdir_SQ)/Git/SVN/Memoize"' >> $@
        set -e; \
        for i in $(modules); \
        do \
+               if test $$i = $${i%/*}; \
+               then \
+                       subdir=; \
+               else \
+                       subdir=/$${i%/*}; \
+               fi; \
                echo '  $(RM) "$$(DESTDIR)$(instdir_SQ)/'$$i'.pm"' >> $@; \
+               echo '  mkdir -p "$$(DESTDIR)$(instdir_SQ)'$$subdir'"' >> $@; \
                echo '  cp '$$i'.pm "$$(DESTDIR)$(instdir_SQ)/'$$i'.pm"' >> $@; \
        done
        echo '  $(RM) "$$(DESTDIR)$(instdir_SQ)/Error.pm"' >> $@