From 7810e99ad2ba8280c1455e2fafaa87dfae14b083 Mon Sep 17 00:00:00 2001
From: Ash McKenzie <amckenzie@gitlab.com>
Date: Wed, 2 Feb 2022 20:22:02 +1100
Subject: Include config_generated.mak if exists

config_generated.mak usually generated by GDK.
---
 .gitignore | 1 +
 Makefile   | 3 +++
 2 files changed, 4 insertions(+)

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
-- 
cgit v1.2.3