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:
authorAsh McKenzie <amckenzie@gitlab.com>2022-02-02 12:22:02 +0300
committerAsh McKenzie <amckenzie@gitlab.com>2022-02-02 12:27:07 +0300
commit7810e99ad2ba8280c1455e2fafaa87dfae14b083 (patch)
treed2018ba3c874947cf93f076952b6c9d85d61ffb1
parent467c86b390c5f2fd530b4f916fbdda1488e02124 (diff)
Include config_generated.mak if existsashmckenzie/assist-building-of-gitaly
config_generated.mak usually generated by GDK.
-rw-r--r--.gitignore1
-rw-r--r--Makefile3
2 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 3659a9723..c372f1e97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,5 @@
# Configuration and runtime data
/config.mak
+/config_generated.mak
/*.toml
diff --git a/Makefile b/Makefile
index c6ccee7d1..16520b690 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,8 @@
# Makefile for Gitaly
+# Generated automatically
+-include config_generated.mak
+
# You can override options by creating a "config.mak" file in Gitaly's root
# directory.
-include config.mak