patch::: 0.1.18.jcn1: Re: how bout

pl 18.jcn1
	- check for python, mf-deps fix

diff --git a/NEWS b/NEWS
index 72917102fb8e2eb14691861f299d9f6f85446c24..8bb1a62c195129307474e7a1d59afa7ef147d272 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+pl 18.jcn1
+       - check for python, mf-deps fix
 
 pl 18
        - bf: Box[X_AXIS] = b

diff --git a/VERSION b/VERSION
index f1fb7e7cf2c8a49550df8cd6032ac215529b0801..48f91a7a72494ea4adc1709e9d1dd73cd991c957 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 TOPLEVEL_MAJOR_VERSION = 0
 TOPLEVEL_MINOR_VERSION = 1
 TOPLEVEL_PATCH_LEVEL = 18
-TOPLEVEL_MY_PATCH_LEVEL = 
+TOPLEVEL_MY_PATCH_LEVEL = .jcn1
 
 # use the above to send patches, always empty for released version:

diff --git a/bin/Makefile b/bin/Makefile
index 8f5410eec0e64e4d31a4017b3666f1f9a8a76ebf..4b3c40476d46aa075cca1844de2f76fa9bdc4003 100644 (file)
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -5,13 +5,15 @@ include $(depth)/make/Include.make
 
 # list of distribution files:
 SCRIPTS = clearlily cpgento make-patch lily.efence \
-       make-version release conflily clean-fonts mf-deps.py
+       make-version release conflily clean-fonts
 PERL_SCRIPTS_IN = $(wildcard *.in)
 PERL_SCRIPTS = $(addprefix $(outdir)/, $(PERL_SCRIPTS_IN:.in=))
-EXTRA_DISTFILES = $(SCRIPTS) $(PERL_SCRIPTS_IN)
+PYTHON_SCRIPTS_IN = $(wildcard *.py)
+PYTHON_SCRIPTS = $(addprefix $(outdir)/, $(PYTHON_SCRIPTS_IN:.py=))
+EXTRA_DISTFILES = $(SCRIPTS) $(PERL_SCRIPTS_IN) $(PYTHON_SCRIPTS_IN) 
 #
 
-all: $(PERL_SCRIPTS)
+all: $(PERL_SCRIPTS) $(PYTHON_SCRIPTS)
 
 $(outdir)/%: %.in
 #      cd .. && CONFIG_FILES=bin/$(notdir $@) CONFIG_HEADERS= ./config.status
@@ -20,8 +22,12 @@ $(outdir)/%: %.in
        sed 's!@PERL@!$(PERL)!' < $< > $@
        chmod 755 $@
 
+$(outdir)/%: %.py
+       sed 's!@PYTHON@!$(PYTHON)!' < $< > $@
+       chmod 755 $@
 
 EXECUTABLES=convert-mudela mudela-book
+
 localinstall: all
        $(INSTALL) -d $(bindir)
        $(INSTALL) -m 755 $(outdir)/convert-mudela $(bindir)

diff --git a/bin/mf-deps.py b/bin/mf-deps.py
index d0784ab5c5473132190e8fc57a04d0a2fbf1b86a..9035162e8d012ac67c43f9f16263be1cab99336a 100644 (file)
--- a/bin/mf-deps.py
+++ b/bin/mf-deps.py
@@ -50,7 +50,7 @@ class Targetdeps:
            return
 
        self.depfiles.append(filename)
-_      lines = file.readlines()
+       lines = file.readlines()
        file.close()
        for line in lines:
            if input_re.match ( line) <> -1:

diff --git a/configure.in b/configure.in
index 2e0c385e877ab5c6a1c7f173996a0a9cd9aa3681..0efe69bab076960a54551c967100c3553830756e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -134,6 +134,7 @@ AC_SUBST(BISON)
 AC_SUBST(FLEX)
 AC_SUBST(LN)
 AC_SUBST(PERL)
+AC_SUBST(PYTHON)
 AC_SUBST(ZIP)
 AC_SUBST(TEXPREFIX)
 AC_SUBST(TEXDIR)
@@ -145,6 +146,7 @@ AC_CHECK_PROGS(BISON, bison, error)
 AC_CHECK_PROGS(FLEX, flex, error)
 AC_CHECK_PROGS(MAKE, make, error)
 AC_PATH_PROG(PERL, perl, error)
+AC_PATH_PROG(PYTHON, python, error)
 AC_CHECK_PROGS(PODMAN, pod2man, error)
 
 
@@ -171,6 +173,7 @@ AC_JUNK_ARGS( [if test "x$MFDIR" = xauto; then
 AC_CHECK_SEARCH_RESULT($MAKE, GNU make,  You should install GNU make)
 AC_CHECK_SEARCH_RESULT( $BISON, bison,  Please install Bison, 1.25 or better)
 AC_CHECK_SEARCH_RESULT($PERL, perl, You should install Perl, version 5 or better)
+AC_CHECK_SEARCH_RESULT($PYTHON, python, You should install Python)
 AC_CHECK_SEARCH_RESULT($PODMAN, pod,  You should install Perl, version 5 or better)
 AC_CHECK_SEARCH_RESULT( $FLEX,  flex, Please install Flex, 2.5 or better)
 

diff --git a/init/font-en-tja16.ly b/init/font-en-tja16.ly
index bed24e7c2d51f10973d0406c51f08845a0bba57a..1c2d0e37505ab65433eaa10b18c1c2dcf83c66a4 100644 (file)
--- a/init/font-en-tja16.ly
+++ b/init/font-en-tja16.ly
@@ -1,4 +1,4 @@
-% generated at Mon Sep 29 11:32:20 1997 from out/font-en-tja16.log
+% generated at Thu Oct  2 14:54:38 1997 from out/font-en-tja16.log
 % changes will be lost
 
 % font-en-tja=\symboltables {

diff --git a/init/font-en-tja20.ly b/init/font-en-tja20.ly
index 69b2154982b57a563b24b78f3f9837ae3bfbd969..c64c12f1280f14096f6fc0a81cfc2a57b4657d58 100644 (file)
--- a/init/font-en-tja20.ly
+++ b/init/font-en-tja20.ly
@@ -1,4 +1,4 @@
-% generated at Mon Sep 29 11:32:24 1997 from out/font-en-tja20.log
+% generated at Thu Oct  2 14:54:38 1997 from out/font-en-tja20.log
 % changes will be lost
 
 % font-en-tja=\symboltables {

diff --git a/make/Configure_variables.make.in b/make/Configure_variables.make.in
index 491fd2afa8817698fd5b4d4821c75cf3a2e35e9d..ad778bc0c657e688a9a85fc7784b19bc63fb5bd5 100644 (file)
--- a/make/Configure_variables.make.in
+++ b/make/Configure_variables.make.in
@@ -31,7 +31,8 @@ BISON = @BISON@
 FLEX = @FLEX@
 LN = @LN@
 ZIP = @ZIP@
-PERL =@PERL@
+PERL = @PERL@
+PYTHON = @PYTHON@
 OUTDIR_NAME = @OUTDIR_NAME@
 
 

diff --git a/mf/Makefile b/mf/Makefile
index 26bc3f01df3f20ba50532cd0cc02e27778f1fe0c..9168cce4ea3d5d20b1eb3c36b1652ea03653da7d 100644 (file)
--- a/mf/Makefile
+++ b/mf/Makefile
@@ -27,7 +27,7 @@ TEXTABLES = $(addprefix $(texout)/, $(FET_FILES:.mf=.tex))
 all: $(LYTABLES) $(TEXTABLES)
 
 localclean:
-       rm -f $(LYTABLES) $(TEXTABLES)
+       rm -f $(LYTABLES) $(TEXTABLES) $(outdir)/mfdeps
 
 $(outdir)/%.dvi: %.mf
        mf $<
@@ -51,16 +51,16 @@ localuninstall:
        for i in $(MFFILES) ; do rm -f $(MFDIR)/lilypond/$$i; done
        -rmdir $(MFDIR)/lilypond/
 
+$(outdir)/mfdeps: $(FONT_FILES)
+# do something silly to avoid barfs if python not installed.
+       echo > $@
+       mf-deps  $^ >> $@
+
 # dependencies:
 #
 include $(outdir)/mfdeps
+#
 
 
 
-$(outdir)/mfdeps: $(FONT_FILES)
-# do something silly to avoid barfs if python not installed.
-       echo > $@
-       python $(depth)/bin/mf-deps.py  $^ >> $@
-
-
 

diff --git a/tex/font-en-tja16.tex b/tex/font-en-tja16.tex
index f48b24729e897fc9f0421f352728ed032e923f1f..db857326d4f94c18ec495081f71185a60e6d6ce8 100644 (file)
--- a/tex/font-en-tja16.tex
+++ b/tex/font-en-tja16.tex
@@ -1,4 +1,4 @@
-% generated at Mon Sep 29 11:32:20 1997 from out/font-en-tja16.log
+% generated at Thu Oct  2 14:54:38 1997 from out/font-en-tja16.log
 % changes will be lost
 
 % font-en-tja

diff --git a/tex/font-en-tja20.tex b/tex/font-en-tja20.tex
index bee8faec97f35acda768950a042ee986aa8cdd38..38ca093ac86b31698145289d05908cbc087e46d8 100644 (file)
--- a/tex/font-en-tja20.tex
+++ b/tex/font-en-tja20.tex
@@ -1,4 +1,4 @@
-% generated at Mon Sep 29 11:32:24 1997 from out/font-en-tja20.log
+% generated at Thu Oct  2 14:54:38 1997 from out/font-en-tja20.log
 % changes will be lost
 
 % font-en-tja