mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-10 07:16:09 +02:00
Code

Merge branch 'ab/simplify-perl-makefile' 

Recent simplification of build procedure forgot a bit of tweak to
the build procedure of contrib/mw-to-git/

* ab/simplify-perl-makefile:
  Makefile: mark perllibdir as a .PHONY target
  perl: fix installing modules from contrib
This commit is contained in:
Junio C Hamano 2018-05-08 15:59:16 +09:00
parent 9bfa0f9be3 d8698987f3
commit c988f6425a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -2021,6 +2021,9 @@ GIT-PERL-DEFINES: FORCE
echo "$$FLAGS" >$@; \
fi
.PHONY: perllibdir
perllibdir:
@echo '$(perllibdir_SQ)'
.PHONY: gitweb
gitweb:

5
contrib/mw-to-git/Makefile
View File

@ -21,8 +21,9 @@ HERE=contrib/mw-to-git/
INSTALL = install
SCRIPT_PERL_FULL=$(patsubst %,$(HERE)/%,$(SCRIPT_PERL))
INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/perl \
-s --no-print-directory instlibdir)
INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/ \
-s --no-print-directory prefix=$(prefix) \
perllibdir=$(perllibdir) perllibdir)
DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
INSTLIBDIR_SQ = $(subst ','\'',$(INSTLIBDIR))