Jonathan Nieder <jrnieder@xxxxxxxxx> writes:
> 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@xxxxxxxxx>
> Signed-off-by: Jonathan Nieder <jrnieder@xxxxxxxxx>
> ---
> Jun 15, 2012 at 02:25:34PM -0700, Junio C Hamano wrote:
>> Jonathan Nieder <jrnieder@xxxxxxxxx> writes:
>
>>> + echo ' mkdir -p blib/lib/Git/SVN/Memoize' >> $@
>>
>> Wouldn't it be much less error prone to maintain if you did not
>> hardcode the "blib/lib/Git/SVN/Memoize is the deepest level" here,
>> and run the "mkdir -p blib/lib/$$(basename $$i)" or something in the
>> loop instead?
>
> Yes, I think so.
>
> Wasn't sure if "install -D" or "dirname" is portable, so this
> patch avoids them.
OK. I suspect others may come up with a cleaner solution, so I'm
tempted to hold this in 'pu' for now and use the original one, which
was _not wrong_ in any way, for the 1.7.11 final.
Thanks.
> perl/Makefile | 16 ++++++++++++++--
> 1 file changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/perl/Makefile b/perl/Makefile
> index fe7a4864..2e8f9804 100644
> --- a/perl/Makefile
> +++ b/perl/Makefile
> @@ -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"' >> $@
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html