(do_chroot_jail): paranoia security for webserver

[lilypond.git] / mf / GNUmakefile

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index f03f63d2a480f71c6605f56e76397fd69919eadc..988d61a402be18c2bdb4430614166d0c6be45c95 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -18,10 +18,10 @@ FETA_MF_FILES = $(wildcard feta[0-9]*.mf)\
 STAFF_SIZES = 11 13 14 16 18 20 23 26
 BRACES = a b c d e f g h i
 
-OTF_FILES = $(addsuffix .otf, $(addprefix $(outdir)/emmentaler, $(STAFF_SIZES)))\
+OTF_FILES = $(addsuffix .otf, $(addprefix $(outdir)/emmentaler-, $(STAFF_SIZES)))\
  $(outdir)/aybabtu.otf
-PE_SCRIPTS = $(addsuffix .pe, $(addprefix $(outdir)/emmentaler, $(STAFF_SIZES))) \
-  $(addsuffix .dep, $(addprefix $(outdir)/emmentaler, $(STAFF_SIZES))) 
+PE_SCRIPTS = $(addsuffix .pe, $(addprefix $(outdir)/emmentaler-, $(STAFF_SIZES))) \
+  $(addsuffix .dep, $(addprefix $(outdir)/emmentaler-, $(STAFF_SIZES))) 
 OTF_TABLES = $(addsuffix .otf-table, $(addprefix $(outdir)/feta, $(STAFF_SIZES))) \
  $(BRACES:%=$(outdir)/feta-braces-%.otf-table)
 FETA_FONTS = $(FETA_MF_FILES:.mf=)
@@ -109,7 +109,7 @@ INSTALLATION_OUT_FILES4=$(CFF_PS_FILES)
 INSTALLATION_OUT_DIR5=$(local_lilypond_datadir)/fonts/type1
 INSTALLATION_OUT_FILES5=$(PFA_FILES)
 
-INSTALLATION_OUT_DIR6=$(local_lilypond_datadir)/dvips/
+INSTALLATION_OUT_DIR6=$(local_lilypond_datadir)/fonts/map
 INSTALLATION_OUT_FILES6=$(outdir)/lilypond.map
 
 INSTALLATION_OUT_DIR7=$(local_lilypond_datadir)/ps/
@@ -125,7 +125,7 @@ INSTALLATION_OUT_FILES9=$(SVG_FILES)
 
 export MFINPUTS:=.:$(MFINPUTS)
 
-default: pfa_warning $(ALL_GEN_FILES) $(outdir)/emmentaler20.otf
+default: pfa_warning $(ALL_GEN_FILES) $(outdir)/emmentaler-20.otf
 
 pfa_warning:
 ifneq ($(shell $(MFTRACE) --version | sed 's/ .*//'),mftrace)
@@ -181,8 +181,16 @@ fontdir: $(addprefix $(outdir)/, lilypond.map lilypond.sfd private-fonts fonts.s
 $(outdir)/lilypond.map: $(AFM_FILES)
        for i in $(FETA_FONTS); do echo $$i $$i '<'$$i.pfa; done > $@
        for i in $(STAFF_SIZES); \
-               do echo "emmentaler$$i emmentaler-$$i <emmentaler$$i.cff.ps" ; done \
+               do echo "emmentaler-$$i emmentaler-$$i <emmentaler-$$i.cff.ps" ; done \
        >> $@
+       echo "aybabtu aybabtu <aybabtu.cff.ps" >> $@
+
+$(outdir)/Fontmap.lily: 
+       for i in $(FETA_FONTS); do echo "/$$i ($$i.pfa);" ; done > $@
+       for i in $(STAFF_SIZES); \
+               do echo "/emmentaler-$$i (emmentaler-$$i.cff.ps);" ; done \
+       >> $@
+       echo "/aybabtu (aybabtu.cff.ps);" >> $@
 
 
 local-clean:
@@ -191,3 +199,12 @@ local-clean:
 
 $(outdir)/%.enc.in: %.enc
        cp $< $@
+
+# teTeX-2.0.x compatibility.
+local-install:
+       -$(INSTALL) -d $(DESTDIR)$(local_lilypond_datadir)/dvips
+       (cd $(DESTDIR)$(local_lilypond_datadir)/dvips && ln -sf ../fonts/map .)
+
+local-uninstall:
+       -rm -f $(DESTDIR)$(local_lilypond_datadir)/dvips/map
+       -rmdir $(DESTDIR)$(local_lilypond_datadir)/dvips