From: janneke <janneke>
Date: Wed, 18 May 2005 09:56:15 +0000 (+0000)
Subject: (setup_paths): Bugfix: pangorc is not pango.modules.
X-Git-Tag: release/2.5.32^2~185
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a2f82a72cf8f5833c722cf27320b8546fa3abe08;p=lilypond.git

(setup_paths): Bugfix: pangorc is not pango.modules.
---

diff --git a/ChangeLog b/ChangeLog
index 2070dfc889..8790410178 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-18  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* lily/main.cc (setup_paths): Bugfix: pangorc is not pango.modules.
+
 2005-05-17  Graham Percival  <gperlist@shaw.ca>
 
 	* Documentation/user/tutorial.itely, basic-notation.itely,
@@ -10,6 +14,9 @@
 
 2005-05-17  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+	* scm/backend-library.scm (postscript->pdf): Remove (useless) .ps
+	when running-from-gui.
+
 	* scm/editor.scm (get-editor): Add platform defaults.
 
 	* scm/backend-library.scm (postscript->pdf): Typo.
diff --git a/lily/main.cc b/lily/main.cc
index f2415d1fec..50ea991b82 100644
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -308,7 +308,7 @@ setup_paths (char const* argv0)
       prepend_env_path ("GUILE_LOAD_PATH", datadir
 			+ to_string ("/guile/%d.%d",
 				     SCM_MAJOR_VERSION, SCM_MINOR_VERSION));
-      sane_putenv ("PANGO_RC_FILE", sysconfdir + "/pango/pango.modules", false);
+      sane_putenv ("PANGO_RC_FILE", sysconfdir + "/pango/pangorc", false);
       prepend_env_path ("PATH", bindir);
     }
 #endif /* ARGV0_RELOCATION */
diff --git a/scm/backend-library.scm b/scm/backend-library.scm
index e200b2dd4a..47b6a20895 100644
--- a/scm/backend-library.scm
+++ b/scm/backend-library.scm
@@ -60,7 +60,8 @@
 
     (ly:message (_ "Converting to `~a'...") pdf-name)
     (ly:progress "\n")
-    (ly:system cmd)))
+    (ly:system cmd)
+    (if (running-from-gui?) (delete-file name))))
 
 (define-public (postscript->png resolution papersizename name)
   (let* ((prefix (ly:effective-prefix))