* Makefile.am (psyntax.pp): Enable rule for psyntax.pp only in

maintainer mode.  Use compile-psyntax.scm for actual compilation.
Make sure the uninstalled guile is used.
(EXTRA_DIST): Distribute compile-psyntax.scm
* compile-psyntax.scm: New file.
* syncase.scm (psyncomp): Removed, it is now in
compile-psyntax.scm.

ice-9/Makefile.am

@@ -45,5 +45,7 @@ install-data-local:
 ## test.scm is not currently installed.
 EXTRA_DIST = $(ice9_sources) test.scm and-let-star-compat.scm
 
+if MAINTAINER_MODE
 psyntax.pp: psyntax.ss
-	cd $(srcdir) && guile -c '(load-from-path "ice-9/syncase") (define-module (ice-9 syncase)) (psyncomp)'
+	GUILE_LOAD_PATH=$(srcdir)/..:.. ../libguile/guile -s compile-psyntax.scm $(srcdir)/psyntax.ss $(srcdir)/psyntax.pp
+endif

ice-9/syncase.scm

@@ -139,22 +139,6 @@
 
 (define generated-symbols (make-weak-key-hash-table 1019))
 
-;;; Utilities
-
-(define (psyncomp)
-  (system "mv -f psyntax.pp psyntax.pp~")
-  (let ((in (open-input-file "psyntax.ss"))
-	(out (open-output-file "psyntax.pp")))
-    (let loop ((x (read in)))
-      (if (eof-object? x)
-	  (begin
-	    (close-port out)
-	    (close-port in))
-	  (begin
-	    (write (sc-expand3 x 'c '(compile load eval)) out)
-	    (newline out)
-	    (loop (read in)))))))
-
 ;;; Load the preprocessed code
 
 (let ((old-debug #f)