From bc4806967a924f0a705f1418293f3948fcf938af Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 1 Mar 2006 17:04:25 +0000
Subject: [PATCH] * stepmake/stepmake/generic-vars.make: new function absdir.

* scripts/lilypond-book.py (find_file): use global_options for
include path
---
 ChangeLog                           | 2 ++
 make/generic-vars.make              | 1 -
 make/mutopia-rules.make             | 2 +-
 python/lilylib.py                   | 2 ++
 scripts/lilypond-book.py            | 5 ++++-
 stepmake/stepmake/generic-vars.make | 3 +++
 6 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2f0f84307a..e089d3a045 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-03-01  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* stepmake/stepmake/generic-vars.make: new function absdir.
+
 	* scripts/convert-ly.py (bindir): use optparse, argv[0] relocation.
 
 	* scripts/lilypond-book.py (find_file): use global_options for
diff --git a/make/generic-vars.make b/make/generic-vars.make
index 652bdd11a1..201a9ea7a4 100644
--- a/make/generic-vars.make
+++ b/make/generic-vars.make
@@ -12,7 +12,6 @@ buildscript-dir = $(src-depth)/buildscripts
 script-dir = $(src-depth)/scripts
 input-dir = $(src-depth)/input
 
-
 flower-dir = $(src-depth)/flower
 lily-dir = $(src-depth)/lily
 mi2mu-dir = $(src-depth)/mi2mu
diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make
index b39307d29a..e5d647d626 100644
--- a/make/mutopia-rules.make
+++ b/make/mutopia-rules.make
@@ -15,7 +15,7 @@ $(outdir)/%.ly: %.abc
 
 # hmm. notdir builds src-dir builds?
 $(outdir)/%.png $(outdir)/%.pdf $(outdir)/%.ly $(outdir)/%.ps: $(outdir)/%.ly
-	cd $(outdir); $(LILYPOND_BINARY) --pdf --png -danti-alias-factor=2 -ddelete-intermediate-files -dno-point-and-click -I $(src-dir)/ $(notdir $<)
+	cd $(outdir); $(LILYPOND_BINARY) --pdf --png -danti-alias-factor=2 -ddelete-intermediate-files -dno-point-and-click -I $(call absdir,$(src-dir))/ $(notdir $<)
 	touch $(outdir)/$(basename $(notdir $<)).png
 
 $(outdir)/%.ly: %.ly
diff --git a/python/lilylib.py b/python/lilylib.py
index 39ae4adc5a..94363e5087 100644
--- a/python/lilylib.py
+++ b/python/lilylib.py
@@ -83,6 +83,7 @@ def error (s):
 	sys.stderr.write (__main__.program_name + ": " + _ ("error: %s") % s + '\n')
 	
 def exit (i):
+	be_verbose = get_global_option('verbose_p', 'verbose')
 	if be_verbose:
 		raise _ ('Exiting (%d)...') % i
 	else:
@@ -315,6 +316,7 @@ Exit status of CMD '''
 	return status
 
 def cleanup_temp ():
+	be_verbose = get_global_option('verbose_p', 'verbose')
 	if not __main__.keep_temp_dir_p:
 		if be_verbose:
 			progress (_ ("Cleaning %s...") % __main__.temp_dir)
diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 460e74eb2e..7b79c9e204 100644
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -686,6 +686,7 @@ def find_file (name):
 		full = os.path.join (i, name)
 		if os.path.exists (full):
 			return full
+		
 	ly.error (_ ("file not found: %s") % name + '\n')
 	ly.exit (1)
 	return ''
@@ -1625,7 +1626,9 @@ def do_options ():
 		options.format = TEXINFO
 	options.use_hash = True
 	options.pseudo_filter = False
-	
+
+	options.include_path =  map (os.path.abspath, options.include_path)
+
 	global global_options
 	global_options = options
 	return args
diff --git a/stepmake/stepmake/generic-vars.make b/stepmake/stepmake/generic-vars.make
index 249ddc82bb..1607631205 100644
--- a/stepmake/stepmake/generic-vars.make
+++ b/stepmake/stepmake/generic-vars.make
@@ -2,6 +2,9 @@ top-build-dir = $(shell cd $(depth) && pwd)
 build-dir = $(shell cd . && pwd)
 tree-dir = $(subst $(top-build-dir),,$(build-dir))
 
+absdir = $(shell cd $(1) ; pwd)
+
+
 ifneq ($(configure-srcdir),.)
 srcdir-build = 1
 endif
-- 
2.39.2