Make the build Python-2/3 agnostic.

diff --git a/INSTALL.adoc b/INSTALL.adoc
index 3e733f34cc61270ab8658a596da2a16db2246dd1..c862b0b089b4ee0bc39d7368a245bd728b3054e8 100644 (file)
--- a/INSTALL.adoc
+++ b/INSTALL.adoc
@@ -1,5 +1,9 @@
 = Installing Open Adventure =
 
 = 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.
 
 1. Install PyYAML for Python 3 (which requires Python 3), and libedit
 (aka: editline) on your system.
 

diff --git a/Makefile b/Makefile
index 62ec64a149d0049878f01a15fe134b21f954ad91..91ec3b672c9530ebd37f6d9acaf4003bcffd6df2 100644 (file)
--- 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
        $(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
 
 clean:
        rm -f *.o advent cheat *.html *.gcno *.gcda

diff --git a/make_dungeon.py b/make_dungeon.py
index 70fab09a75a15ea0efb886abb569af75c956676a..ddbfc2e6fcf77a2f6b2f78706339867957c62b3d 100755 (executable)
--- 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.
 
 # 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.