From 2f69cd4209fcb87d209d6d884f8a932f92c2485b Mon Sep 17 00:00:00 2001 From: Calvin Rose Date: Sun, 23 Oct 2022 13:11:07 -0500 Subject: [PATCH] Add easier option for adding config.mk in root directory. --- .gitignore | 5 ++++- Makefile | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 73449d15..511a24f4 100644 --- a/.gitignore +++ b/.gitignore @@ -68,10 +68,13 @@ tags vgcore.* *.out.* -# Wix artifacts +# WiX artifacts *.msi *.wixpdb +# Makefile config +/config.mk + # Created by https://www.gitignore.io/api/c ### C ### diff --git a/Makefile b/Makefile index 45499772..8079a98b 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ ################################ ##### Set global variables ##### ################################ - +sinclude config.mk PREFIX?=/usr/local INCLUDEDIR?=$(PREFIX)/include