From e1765c97f6f15a2a8e65eba4d0480c299b2180ab Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Wed, 24 Feb 1999 15:46:24 +0000
Subject: [PATCH] lilypond-1.1.33

---
 mf/GNUmakefile                             | 21 ++++----
 stepmake/stepmake/install-out-targets.make | 68 +++++++++++---------------
 stepmake/stepmake/install-targets.make     | 77 +++++++++++-------------------
 3 files changed, 66 insertions(+), 100 deletions(-)
 rewrite stepmake/stepmake/install-out-targets.make (78%)
 rewrite stepmake/stepmake/install-targets.make (71%)

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index b2db6331c5..3c04833f44 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -8,33 +8,34 @@ EXTRA_DIST_FILES += TODO README feta.mp mfplain.ini
 
 FET_FILES = $(wildcard feta[0-9]*.mf)
 
-LYTABLES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.ly))
 LOG_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.log))
 TEXTABLES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.tex))
 XPM_FONTS = feta20
 AFM_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.afm)) 
 TFM_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.tfm)) 
 
-ALL_GEN_FILES=$(LYTABLES) $(TEXTABLES) $(LOG_FILES) $(AFM_FILES) $(TFM_FILES)
+ALL_GEN_FILES= $(TEXTABLES) $(LOG_FILES) $(AFM_FILES) $(TFM_FILES)
 
 #PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)"
 INSTALLATION_DIR=$(datadir)/mf/
 INSTALLATION_FILES=$(MF_FILES)
 
-INSTALLATION_OUT_DIR=$(datadir)/tex
-INSTALLATION_OUT_FILES=$(TEXTABLES)
+INSTALLATION_OUT_SUFFIXES=1 2 3
 
-INSTALLATION_OUT_DIR1=$(datadir)/afm
-INSTALLATION_OUT_FILES1=$(AFM_FILES) $(TFM_FILES)#ugh
+INSTALLATION_OUT_DIR1=$(datadir)/tex
+INSTALLATION_OUT_FILES1=$(TEXTABLES)
 
-INSTALLATION_OUT_DIR2=$(datadir)/ly
-INSTALLATION_OUT_FILES2=$(LYTABLES)
+INSTALLATION_OUT_DIR2=$(datadir)/afm
+INSTALLATION_OUT_FILES2=$(AFM_FILES)
+
+INSTALLATION_OUT_DIR3=$(datadir)/tfm
+INSTALLATION_OUT_FILES3=$(TFM_FILES)
 
 export MFINPUTS:=.:$(MFINPUTS)
 include $(depth)/make/stepmake.make 
 
 default: $(ALL_GEN_FILES)
 
-$(outdir)/%.afm $(outdir)/%.ly $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log
-	$(PYTHON) $(buildscripts)/mf-to-table.py --package=$(topdir) --outdir=$(outdir) --dep $(outdir)/$(<F:.log=.dep) --ly $(outdir)/$(<F:.log=.ly) --afm $(outdir)/$(<F:.log=.afm) --tex $(outdir)/$(<F:.log=.tex) $<
+$(outdir)/%.afm  $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log
+	$(PYTHON) $(buildscripts)/mf-to-table.py --package=$(topdir) --outdir=$(outdir) --dep $(outdir)/$(<F:.log=.dep)  --afm $(outdir)/$(<F:.log=.afm) --tex $(outdir)/$(<F:.log=.tex) $<
 
diff --git a/stepmake/stepmake/install-out-targets.make b/stepmake/stepmake/install-out-targets.make
dissimilarity index 78%
index eb445927a9..e461473f6b 100644
--- a/stepmake/stepmake/install-out-targets.make
+++ b/stepmake/stepmake/install-out-targets.make
@@ -1,41 +1,27 @@
-# install-out-targets.make
-
-localinstall: localinstall-files localinstall-outfiles
-
-localinstall-files:
-
-# urg, parameterise
-localinstall-outfiles: $(INSTALLATION_OUT_FILES) $(INSTALLATION_OUT_FILES1) $(INSTALLATION_OUT_FILES2)
-	-$(INSTALL) -d $(INSTALLATION_OUT_DIR)
-	$(foreach i, $(INSTALLATION_OUT_FILES), \
-		$(INSTALL) -m 644 $(i) $(INSTALLATION_OUT_DIR) && )true
-ifneq ($(strip $(INSTALLATION_OUT_FILES1)),)
-	-$(INSTALL) -d $(INSTALLATION_OUT_DIR1)
-	$(foreach i, $(INSTALLATION_OUT_FILES1), \
-		$(INSTALL) -m 644 $(i) $(INSTALLATION_OUT_DIR1) && )true
-endif
-ifneq ($(strip $(INSTALLATION_OUT_FILES2)),)
-	-$(INSTALL) -d $(INSTALLATION_OUT_DIR2)
-	$(foreach i, $(INSTALLATION_OUT_FILES2), \
-		$(INSTALL) -m 644 $(i) $(INSTALLATION_OUT_DIR2) && )true
-endif
-
-localuninstall: localuninstall-outfiles localuninstall-files 
-
-localuninstall-files:
-
-localuninstall-outfiles:
-	$(foreach  i, $(notdir $(INSTALLATION_OUT_FILES)), \
-		rm -f $(INSTALLATION_OUT_DIR)/$(i) && ) true
-	-rmdir $(INSTALLATION_OUT_DIR)
-ifneq ($(strip $(INSTALLATION_OUT_FILES1)),)
-	$(foreach  i, $(notdir $(INSTALLATION_OUT_FILES1)), \
-		rm -f $(INSTALLATION_OUT_DIR1)/$(i) && ) true
-	-rmdir $(INSTALLATION_OUT_DIR1)
-endif
-ifneq ($(strip $(INSTALLATION_OUT_FILES2)),)
-	$(foreach  i, $(notdir $(INSTALLATION_OUT_FILES2)), \
-		rm -f $(INSTALLATION_OUT_DIR2)/$(i) && ) true
-	-rmdir $(INSTALLATION_OUT_DIR2)
-endif
-#	-(cd $(INSTALLATION_OUT_DIR)/..; dir=`dirname \`pwd\`` cd ..; rmdir $$dir)
+# install-out-targets.make
+
+localinstall: localinstall-files localinstall-outfiles
+
+localinstall-files:
+
+# urg, parameterise
+localinstall-outfiles: $(INSTALLATION_OUT_FILES) $(foreach suff, $(INSTALLATION_OUT_SUFFIXES), $(INSTALLATION_OUT_FILES$(suff)))
+	-$(INSTALL) -d $(INSTALLATION_OUT_DIR)
+	$(foreach i, $(INSTALLATION_OUT_FILES), \
+		$(INSTALL) -m 644 $(i) $(INSTALLATION_OUT_DIR) && ) true
+	$(foreach suff, $(INSTALLATION_OUT_SUFFIXES),  \
+		$(foreach i, $(INSTALLATION_OUT_FILES$(suff)), \
+			$(INSTALL) -m 644 $(i) $(INSTALLATION_OUT_DIR$(suff)) && ) true && ) true
+
+
+localuninstall: localuninstall-outfiles localuninstall-files 
+
+localuninstall-files:
+
+localuninstall-outfiles:
+	rm -f $(foreach  i, $(notdir $(INSTALLATION_OUT_FILES)), \
+		$(INSTALLATION_OUT_DIR)/$(i))
+	rm -f $(foreach suff, $(INSTALLATION_OUT_SUFFIXES),  \
+		$(foreach i, $(INSTALLATION_OUT_FILES$(suff)), \
+			$(INSTALLATION_OUT_DIR$(suff))/$(i)))
+	-rmdir $(INSTALLATION_OUT_DIR) $(foreach suff, $(INSTALLATION_OUT_SUFFIXES), $(INSTALLATION_OUT_DIR$(suff)))
diff --git a/stepmake/stepmake/install-targets.make b/stepmake/stepmake/install-targets.make
dissimilarity index 71%
index aa648c3541..6351355541 100644
--- a/stepmake/stepmake/install-targets.make
+++ b/stepmake/stepmake/install-targets.make
@@ -1,49 +1,28 @@
-# install-targets.make
-
-localinstall: localinstall-files localinstall-outfiles
-
-localinstall-outfiles:
-
-# urg, parameterise
-localinstall-files:
-	$(PRE_INSTALL)
-	-$(INSTALL) -d $(INSTALLATION_DIR)
-	$(foreach i,  $(INSTALLATION_FILES),\
-		$(INSTALL) -m 644 $(i) $(INSTALLATION_DIR) &&)true
-	$(POST_INSTALL)
-ifneq ($(strip $(INSTALLATION_FILES1)),)
-	$(PRE_INSTALL1)
-	-$(INSTALL) -d $(INSTALLATION_DIR1)
-	$(foreach i,  $(INSTALLATION_FILES1),\
-		$(INSTALL) -m 644 $(i) $(INSTALLATION_DIR1) &&)true
-	$(POST_INSTALL1)
-endif
-ifneq ($(strip $(INSTALLATION_FILES2)),)
-	$(PRE_INSTALL2)
-	-$(INSTALL) -d $(INSTALLATION_DIR2)
-	$(foreach i,  $(INSTALLATION_FILES2),\
-		$(INSTALL) -m 644 $(i) $(INSTALLATION_DIR2) &&)true
-	$(POST_INSTALL2)
-endif
-
-localuninstall: localuninstall-outfiles localuninstall-files 
-
-localuninstall-outfiles:
-
-localuninstall-files:
-	$(foreach i,  $(INSTALLATION_FILES),\
-		rm -f $(INSTALLATION_DIR)/$(i) && ) true
-	-$(foreach i, $(SUBDIRS), rmdir $(INSTALLATION_DIR)/$(i); )
-	-rmdir $(INSTALLATION_DIR)
-ifneq ($(strip $(INSTALLATION_FILES1)),)
-	$(foreach i,  $(INSTALLATION_FILES1),\
-		rm -f $(INSTALLATION_DIR1)/$(i) && ) true
-	-$(foreach i, $(SUBDIRS), rmdir $(INSTALLATION_DIR1)/$(i); )
-	-rmdir $(INSTALLATION_DIR1)
-endif
-ifneq ($(strip $(INSTALLATION_FILES2)),)
-	$(foreach i,  $(INSTALLATION_FILES2),\
-		rm -f $(INSTALLATION_DIR2)/$(i) && ) true
-	-$(foreach i, $(SUBDIRS), rmdir $(INSTALLATION_DIR2)/$(i); )
-	-rmdir $(INSTALLATION_DIR2)
-endif
+# install-targets.make
+
+localinstall: localinstall-files localinstall-outfiles
+
+localinstall-outfiles:
+
+# urg, parameterise
+localinstall-files:
+	$(PRE_INSTALL)
+	-$(INSTALL) -d $(INSTALLATION_DIR)
+	$(foreach i,  $(INSTALLATION_FILES),\
+		$(INSTALL) -m 644 $(i) $(INSTALLATION_DIR) &&)true
+	$(foreach suff, $(INSTALLATION_SUFFIXES),  \
+		$(foreach i, $(INSTALLATION_FILES$(suff)), \
+			$(INSTALL) -m 644 $(i) $(INSTALLATION_DIR$(suff))  && )  && ) true
+	$(POST_INSTALL)
+
+localuninstall: localuninstall-outfiles localuninstall-files 
+
+localuninstall-outfiles:
+
+localuninstall-files:
+	rm -f $(foreach i,  $(INSTALLATION_FILES), $(INSTALLATION_DIR)/$(i))
+	rm -f $(foreach suff, $(INSTALLATION_SUFFIXES),  \
+		$(foreach i, $(INSTALLATION_FILES$(suff)),\
+			$(INSTALLATION_DIR$(suff)/$(i))))
+	rmdir $(INSTALLATION_DIR) $(foreach suff, $(INSTALLATION_SUFFIXES), $(INSTALLATION_DIR$(suff)))
+
-- 
2.11.4.GIT