Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Steinhardt <psteinhardt@gitlab.com>2021-12-01 10:05:21 +0300
committerPatrick Steinhardt <psteinhardt@gitlab.com>2021-12-01 13:24:21 +0300
commit17bb9d1e61ea777d1e113def771fa07f660949ae (patch)
treeb3e8e9610d6a4c0e3c0227f30d3ff4fb4194d9ee /Makefile
parentfb81673084d988ca301f207b79de9dda909d096c (diff)
Makefile: Do not create Git install directory manually
When installing Git via `make git`, we first clean up the GIT_INSTALL_DIR by removing it completely. This is expected, as it is the default location of the Git installation located in our own build directory, and we want to have a tidy installation in there. After the cleanup, we do recreate the target directory though, which is completely unnecessary: the Makefile target would create it for us anyway, and in case the default installation directory isn't used we wouldn't use that directory anyway. Stop creating the directory and let the Makefile target handle it for us.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index b978dd648..7d3bea2de 100644
--- a/Makefile
+++ b/Makefile
@@ -581,7 +581,6 @@ ${GIT_PREFIX}/bin/git: ${GIT_SOURCE_DIR}/Makefile
# want to delete the actual location the user wants to install to.
# Otherwise, we may end up wiping e.g. `/usr/local`.
${Q}rm -rf ${GIT_INSTALL_DIR}
- ${Q}mkdir -p ${GIT_INSTALL_DIR}
${Q}env -u PROFILE -u MAKEFLAGS -u GIT_VERSION ${MAKE} -C ${GIT_SOURCE_DIR} -j$(shell nproc) prefix=${GIT_PREFIX} ${GIT_BUILD_OPTIONS} install
${Q}touch $@