From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 8 Nov 2019 20:26:35 +0000 (+0000)
Subject: base91: Python: make `import' work
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=78ac8cd6901e718573aa5b3ef59c6de1b6cc5c07;p=secnet.git

base91: Python: make `import' work

We have subtree merged the base91 python module as base91-python.

We will want to be able to `import base91'.  So make a symlink
`base91.py', and arrange to install it.  ($(INSTALL) installs a copy
of the file, not the link, as we need it to.)

This is getting rather intimate with the file structure of the
upstream base91-python.  If base91-python ever becomes more
complicated, and this breaks, it would surely be best to make it into
its own package.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/Subdir.sd.mk b/Subdir.sd.mk
index f080f07..7ee0019 100644
--- a/Subdir.sd.mk
+++ b/Subdir.sd.mk
@@ -55,7 +55,7 @@ OBJECTS:=secnet.o util.o conffile.yy.o conffile.tab.o conffile.o modules.o \
 	hackypar.o base91s/base91.o
 # version.o is handled specially below and in the link rule for secnet.
 
-PYMODULES := ipaddrset.py argparseactionnoyes.py
+PYMODULES := ipaddrset.py argparseactionnoyes.py base91.py
 
 TEST_OBJECTS:=eax-aes-test.o eax-serpent-test.o eax-serpentbe-test.o \
 		eax-test.o aes.o
diff --git a/base91.py b/base91.py
new file mode 120000
index 0000000..f407d44
--- /dev/null
+++ b/base91.py
@@ -0,0 +1 @@
+base91-python/base91/__init__.py
\ No newline at end of file