Skip to content

Commit

Permalink
perl/Makefile: move "mkdir -p" to module installation loop for mainta…
Browse files Browse the repository at this point in the history
…inability

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>
  • Loading branch information
Jonathan Nieder authored and Junio C Hamano committed Jun 15, 2012
1 parent 7dba3f7 commit 73abda3
Showing 1 changed file with 14 additions and 2 deletions.
16 changes: 14 additions & 2 deletions perl/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,22 +34,34 @@ modules += Git/SVN/Ra

$(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"' >> $@
Expand Down

0 comments on commit 73abda3

Please sign in to comment.