summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorCameron Katri <me@cameronkatri.com>2021-05-05 15:00:19 -0400
committerCameron Katri <me@cameronkatri.com>2021-05-05 15:00:19 -0400
commitdfc80bf956a344dcd185f6db2980af7919c52e0d (patch)
tree21077bdd964c0747b042dc95aa69f70f0719bcf9 /Makefile
parent1c75ca2e2dc72d118edbb854455e602d70d80a52 (diff)
downloadbsdgames-darwin-dfc80bf956a344dcd185f6db2980af7919c52e0d.tar.gz
bsdgames-darwin-dfc80bf956a344dcd185f6db2980af7919c52e0d.tar.zst
bsdgames-darwin-dfc80bf956a344dcd185f6db2980af7919c52e0d.zip
Fix merge conflictsHEADtrunk
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index fbb0be58..4aa82ef0 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ config.h:
update:
TEMP=$$(mktemp -d); \
- cd ~/Documents/BSD/NetBSD; \
+ cd ~/Documents/NetBSD; \
git format-patch -o $$TEMP $(shell cat upstream-commit) games; \
git rev-list HEAD -1 games/ > $(ROOT)/upstream-commit; \
cd $(ROOT); \