(local-install-outfiles): only create directory if

$(INSTALLATION_OUT_DIR) is defined. This fixes install on Gentoo.

diff --git a/ChangeLog b/ChangeLog
index a4272d482c85faf492a8795419ba9d5783dd1b57..da74094d046198261d8dc5ccd96399b8456e035f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-22  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * stepmake/stepmake/install-out-targets.make
+       (local-install-outfiles): only create directory if
+       $(INSTALLATION_OUT_DIR) is defined. This fixes install on Gentoo.
+
 2006-01-21  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * lily/ttf.cc (LY_DEFINE): new function ly:font-glyph-list.

diff --git a/lily/ttf.cc b/lily/ttf.cc
index f1163e884cec7808a3bae4d2c8af18ad820c6e99..78530d00da6ae666984bd5d0e5c07773d9356aad 100644 (file)
--- a/lily/ttf.cc
+++ b/lily/ttf.cc
@@ -191,6 +191,9 @@ LY_DEFINE (ly_font_glyph_list, "ly:font-glyph-list",
     }
   
   FT_Done_Face (face);
+
+  if (be_verbose_global)
+    progress_indication ("]");  
   return retval;
 }
 
@@ -207,10 +210,11 @@ LY_DEFINE (ly_ttf_ps_name, "ly:ttf-ps-name",
   FT_Face face = open_ft_face (file_name);
   char const *ps_name_str0 = FT_Get_Postscript_Name (face);
   
+  FT_Done_Face (face);
+  
   if (be_verbose_global)
     progress_indication ("]");
 
-  FT_Done_Face (face);
   return scm_makfrom0str (ps_name_str0 ? ps_name_str0 : "");
 }
 

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 6644da30f8561d6147acc1955d6dcb83195df108..b9c3bac5d257c5f5ed716dcae11fde8b905df3be 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -150,10 +150,11 @@ PFA_FILES = $(ALL_FONTS:%=$(outdir)/%.pfa) $(PFA_OTF_FILES)
 ALL_GEN_FILES= $(TFM_FILES) $(TEXTABLES) $(TFM_FILES) $(LOG_FILES) $(ENC_FILES) $(LISP_FILES) $(FETA_LIST_FILES)  $(OTF_TABLES) $(NCSB_TTFS) $(PFA_FILES) $(OTF_FILES) $(SVG_FILES) $(outdir)/fonts.cache-1 
 
 #PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)"
+
 INSTALLATION_DIR=$(local_lilypond_datadir)/fonts/source
 INSTALLATION_FILES=$(MF_FILES) $(AF_FILES)
 
-INSTALLATION_OUT_SUFFIXES=1 2 3 5 7 8 9
+INSTALLATION_OUT_SUFFIXES=1 2 3 4 5 6 
 
 INSTALLATION_OUT_DIR1=$(local_lilypond_datadir)/tex
 INSTALLATION_OUT_FILES1=$(TEXTABLES)
@@ -164,14 +165,14 @@ INSTALLATION_OUT_FILES2=$(OTF_FILES) $(NCSB_TTFS)
 INSTALLATION_OUT_DIR3=$(local_lilypond_datadir)/fonts/tfm
 INSTALLATION_OUT_FILES3=$(TFM_FILES)
 
+INSTALLATION_OUT_DIR4=$(local_lilypond_datadir)/fonts/svg
+INSTALLATION_OUT_FILES4=$(SVG_FILES)
+
 INSTALLATION_OUT_DIR5=$(local_lilypond_datadir)/fonts/type1
 INSTALLATION_OUT_FILES5=$(PFA_FILES)
 
-INSTALLATION_OUT_DIR7=$(local_lilypond_datadir)/ps/
-INSTALLATION_OUT_FILES7=$(ENC_FILES)
-
-INSTALLATION_OUT_DIR9=$(local_lilypond_datadir)/fonts/svg
-INSTALLATION_OUT_FILES9=$(SVG_FILES)
+INSTALLATION_OUT_DIR6=$(local_lilypond_datadir)/ps/
+INSTALLATION_OUT_FILES6=$(ENC_FILES)
 
 
 export MFINPUTS:=.:$(MFINPUTS)

diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index a733584112c8904e503bc84999db1e3f6a67a566..23a0bd15fc822ad08add36bcad5e284ecfc07836 100644 (file)
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -695,7 +695,6 @@ alignment accordingly."
        (x (ly:stencil-extent m X))
        (y (ly:stencil-extent m Y)))
 
-
     (ly:make-stencil (ly:stencil-expr m)
                     (interval-union x-ext x)
                     (interval-union y-ext y))))

diff --git a/stepmake/bin/install.py b/stepmake/bin/install.py
index e3fb48a017453538c2cf2b27f5efd83fd152d6a8..2a29e353c02453b027586fb4442fafabd66f8a2d 100644 (file)
--- a/stepmake/bin/install.py
+++ b/stepmake/bin/install.py
@@ -65,9 +65,8 @@ if not create_dir:
        dest = args.pop()
 
 for f in args:
-       if create_dir:
-               if not os.path.isdir (f):
-                       os.makedirs (f, mode=mode)
+       if create_dir and not os.path.isdir (f):
+               os.makedirs (f, mode=mode)
                chown_me.append (f)
        else:
                if copy:

diff --git a/stepmake/stepmake/install-out-targets.make b/stepmake/stepmake/install-out-targets.make
index 6b987d8463a19be35fe861cb8e0fdd56b2d46885..0892bc085ac032b226465a44fb3e88d492cc8ea0 100644 (file)
--- a/stepmake/stepmake/install-out-targets.make
+++ b/stepmake/stepmake/install-out-targets.make
@@ -5,8 +5,9 @@ local-install-files:
 
 # urg, parameterise
 local-install-outfiles: $(INSTALLATION_OUT_FILES) $(foreach suff, $(INSTALLATION_OUT_SUFFIXES), $(INSTALLATION_OUT_FILES$(suff)))
-       -$(INSTALLPY) -d $(DESTDIR)$(INSTALLATION_OUT_DIR)
-       $(INSTALLPY) -c -m 644 $(INSTALLATION_OUT_FILES) $(DESTDIR)$(INSTALLATION_OUT_DIR)/
+       $(if $(INSTALLATION_OUT_DIR),\
+               ($(INSTALLPY) -d $(DESTDIR)$(INSTALLATION_OUT_DIR) || true) \
+                && $(INSTALLPY) -c -m 644 $(INSTALLATION_OUT_FILES) $(DESTDIR)$(INSTALLATION_OUT_DIR)/, true)
        $(foreach suff, $(INSTALLATION_OUT_SUFFIXES),  \
                ($(INSTALLPY) -d $(DESTDIR)$(INSTALLATION_OUT_DIR$(suff))/ || true) && \
                $(INSTALLPY) -c -m 644 $(INSTALLATION_OUT_FILES$(suff)) $(DESTDIR)$(INSTALLATION_OUT_DIR$(suff))/ && ) true

diff --git a/stepmake/stepmake/install-targets.make b/stepmake/stepmake/install-targets.make
index efa1273aff478246c0567f7c9b4c3ad03d19d665..c13a4cc779c34bbbd0812cb86f24a04f09a60dbf 100644 (file)
--- a/stepmake/stepmake/install-targets.make
+++ b/stepmake/stepmake/install-targets.make
@@ -8,7 +8,6 @@ local-install-files: $(INSTALLATION_FILES)
        $(PRE_INSTALL)
        -$(INSTALLPY) -d $(DESTDIR)$(INSTALLATION_DIR)
        $(INSTALLPY) -m 644 $(addprefix $(src-dir)/,$(INSTALLATION_FILES)) $(DESTDIR)$(INSTALLATION_DIR)/
-
        $(foreach suff, $(INSTALLATION_SUFFIXES),  \
                ($(INSTALLPY) -d $(DESTDIR)$(INSTALLATION_DIR$(suff)) || true) && \
                $(INSTALLPY) -m 644  $(addprefix $(src-dir)/, $(INSTALLATION_FILES$(suff))) $(DESTDIR)$(INSTALLATION_DIR$(suff))/ )