mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-30 13:57:54 +01:00
Code Activity

perl/Makefile: move "mkdir -p" to module installation loop for maintainability

Browse source 
In the NO_PERL_MAKEMAKER=YesPlease fallback case, make the directory
that will contain each module when installing it (simulating "install
-D") instead of hardcoding "Git/SVN/Memoize is the deepest level".
This should make this codepath which is not used often on development
machines a little easier to maintain.

Requested-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Nieder 2012-06-15 18:02:34 -05:00 committed by Junio C Hamano
parent 7dba3f73e9
commit 73abda3b2a
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
perl/Makefile
View file

@ -34,22 +34,34 @@ modules += Git/SVN/Ra
$(makfile): ../GIT-CFLAGS Makefile $(makfile): ../GIT-CFLAGS Makefile
echo all: private-Error.pm Git.pm Git/I18N.pm > $@ echo all: private-Error.pm Git.pm Git/I18N.pm > $@
echo ' mkdir -p blib/lib/Git/SVN/Memoize' >> $@
set -e; \ set -e; \
for i in $(modules); \ for i in $(modules); \
do \ do \
if test $$i = $${i%/*}; \
then \
subdir=; \
else \
subdir=/$${i%/*}; \
fi; \
echo ' $(RM) blib/lib/'$$i'.pm' >> $@; \ echo ' $(RM) blib/lib/'$$i'.pm' >> $@; \
echo ' mkdir -p blib/lib'$$subdir >> $@; \
echo ' cp '$$i'.pm blib/lib/'$$i'.pm' >> $@; \ echo ' cp '$$i'.pm blib/lib/'$$i'.pm' >> $@; \
done done
echo ' $(RM) blib/lib/Error.pm' >> $@ echo ' $(RM) blib/lib/Error.pm' >> $@
'$(PERL_PATH_SQ)' -MError -e 'exit($$Error::VERSION < 0.15009)' || \ '$(PERL_PATH_SQ)' -MError -e 'exit($$Error::VERSION < 0.15009)' || \
echo ' cp private-Error.pm blib/lib/Error.pm' >> $@ echo ' cp private-Error.pm blib/lib/Error.pm' >> $@
echo install: >> $@ echo install: >> $@
echo ' mkdir -p "$$(DESTDIR)$(instdir_SQ)/Git/SVN/Memoize"' >> $@
set -e; \ set -e; \
for i in $(modules); \ for i in $(modules); \
do \ do \
if test $$i = $${i%/*}; \
then \
subdir=; \
else \
subdir=/$${i%/*}; \
fi; \
echo ' $(RM) "$$(DESTDIR)$(instdir_SQ)/'$$i'.pm"' >> $@; \ echo ' $(RM) "$$(DESTDIR)$(instdir_SQ)/'$$i'.pm"' >> $@; \
echo ' mkdir -p "$$(DESTDIR)$(instdir_SQ)'$$subdir >> $@; \
echo ' cp '$$i'.pm "$$(DESTDIR)$(instdir_SQ)/'$$i'.pm"' >> $@; \ echo ' cp '$$i'.pm "$$(DESTDIR)$(instdir_SQ)/'$$i'.pm"' >> $@; \
done done
echo ' $(RM) "$$(DESTDIR)$(instdir_SQ)/Error.pm"' >> $@ echo ' $(RM) "$$(DESTDIR)$(instdir_SQ)/Error.pm"' >> $@