From: Jason S. Ninneman <jsn@mbar.us>
Date: Tue, 11 Jul 2017 22:54:16 +0000 (-0700)
Subject: Make the build Python-2/3 agnostic.
X-Git-Tag: 1.3~134
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=b8dd0eb90412fe7cb062ae8838baf10446e16794;p=open-adventure.git

Make the build Python-2/3 agnostic.
---

diff --git a/INSTALL.adoc b/INSTALL.adoc
index 3e733f3..c862b0b 100644
--- a/INSTALL.adoc
+++ b/INSTALL.adoc
@@ -1,5 +1,9 @@
 = Installing Open Adventure =
 
+The instructions below assume your system uses Python 3 by default,
+but the actual Python code in Open Adventure is 2/3 agnostic. Adjust
+the example commands below accordingly.
+
 1. Install PyYAML for Python 3 (which requires Python 3), and libedit
 (aka: editline) on your system.
 
diff --git a/Makefile b/Makefile
index 62ec64a..91ec3b6 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ dungeon.o:	dungeon.c dungeon.h
 	$(CC) $(CCFLAGS) $(DBX) -c dungeon.c
 
 dungeon.c dungeon.h: make_dungeon.py adventure.yaml
-	python3 make_dungeon.py
+	./make_dungeon.py
 
 clean:
 	rm -f *.o advent cheat *.html *.gcno *.gcda
diff --git a/make_dungeon.py b/make_dungeon.py
index 70fab09..ddbfc2e 100755
--- a/make_dungeon.py
+++ b/make_dungeon.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python
 
 # This is the open-adventure dungeon generator. It consumes a YAML description of
 # the dungeon and outputs a dungeon.h and dungeon.c pair of C code files.