From 8a78f45e25a69445ffac42175f2d19df002115f6 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Thu, 22 Dec 2016 19:49:41 +0100
Subject: [PATCH] Use include-from-path for psyntax.pp.

* module/mes/psyntax.pp: Rename from module/mes/psyntax-pp.mes.
* module/mes/psyntax.mes: Update.
* AUTHORS: Update.
---
 AUTHORS                                   |  4 ++--
 GNUmakefile                               | 10 ++++++----
 module/mes/psyntax.mes                    |  2 +-
 module/mes/{psyntax-pp.mes => psyntax.pp} |  0
 4 files changed, 9 insertions(+), 7 deletions(-)
 rename module/mes/{psyntax-pp.mes => psyntax.pp} (100%)

diff --git a/AUTHORS b/AUTHORS
index 426f375e..4605e407 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -19,9 +19,9 @@ module/mes/match.scm
 Portable LALR(1) parser generator
 module/mes/lalr.scm
 
-Portable syntax-case from Chez Scheme
+Portable syntax-case from Chez Scheme; patches from Guile
 module/mes/psyntax.ss
-module/mes/psyntax-pp.mes [generated]
+module/mes/psyntax.pp [generated]
 
 Optargs from Guile
 module/mes/optargs.scm
diff --git a/GNUmakefile b/GNUmakefile
index 7a77588c..9ca776b5 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -113,10 +113,12 @@ guile-mescc: mescc.cat
 paren: all
 	scripts/paren.mes
 
-GUILE_GIT:=$(HOME)/src/guile
-psyntax-import:
-	git --git-dir=$(GUILE_GIT)/.git --work-tree=$(GUILE_GIT) show ba8a709:ice-9/psyntax.ss > module/mes/psyntax.ss
-	git --git-dir=$(GUILE_GIT)/.git --work-tree=$(GUILE_GIT) show ba8a709:ice-9/psyntax.pp > module/mes/psyntax-pp.mes
+GUILE_GIT:=$(HOME)/src/guile-1.8
+GUILE_COMMIT:=ba8a709
+psyntax-import: module/mes/psyntax.ss module/mes/psyntax.pp
+
+module/mes/psyntax.%: $(GUILE_GIT)/ice-9/psyntax.%
+	git --git-dir=$(GUILE_GIT)/.git --work-tree=$(GUILE_GIT) show $(GUILE_COMMIT):ice-9/$(@F > $@
 
 help: help-top
 
diff --git a/module/mes/psyntax.mes b/module/mes/psyntax.mes
index 726d534e..d3b6a07e 100644
--- a/module/mes/psyntax.mes
+++ b/module/mes/psyntax.mes
@@ -23,6 +23,6 @@
 ;;; Code:
 
 (mes-use-module (mes psyntax-0))
-(mes-use-module (mes psyntax-pp))
+(include-from-path "mes/psyntax.pp")
 (mes-use-module (mes psyntax-1))
 (mes-use-module (mes quasisyntax))
diff --git a/module/mes/psyntax-pp.mes b/module/mes/psyntax.pp
similarity index 100%
rename from module/mes/psyntax-pp.mes
rename to module/mes/psyntax.pp