From 17372a6eab00518eb8496f6e0622c3de01d03a5a Mon Sep 17 00:00:00 2001
From: janneke <janneke>
Date: Sun, 13 Nov 2005 08:40:52 +0000
Subject: [PATCH] * make/mutopia-vars.make: * make/ly-vars.make: Use
 src-wildcard iso wildcard for source files.

---
 ChangeLog              |  8 +++++++-
 make/ly-vars.make      | 10 +++++-----
 make/mutopia-vars.make |  8 ++++----
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9376cd0884..5d2815cd54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-13  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* make/mutopia-vars.make:
+	* make/ly-vars.make: Use src-wildcard iso wildcard for source
+	files.
+
 2005-11-13  Werner Lemberg  <wl@gnu.org>
 
 	* mf/feta-arrow.mf: For all glyphs, don't mirror `currentpicture'
@@ -186,7 +192,7 @@
 	* flower/file-path.cc (find): Bugfix: Return name of file found.
 
 	* lily/main.cc (setup_paths): Bugfix for argv0 logic.
-	(setup_paths)[__CYGWIN__ || __MINGW32__ || ]: Normalize argv0.
+	(setup_paths)[__CYGWIN__ || __MINGW32__]: Normalize argv0.
 	(setup_paths)[__MINGW32__]: Also look for argv0 + .exe.
 
 2005-11-03  Han-Wen Nienhuys  <hanwen@xs4all.nl>
diff --git a/make/ly-vars.make b/make/ly-vars.make
index 9135bc4741..802c89b4ce 100644
--- a/make/ly-vars.make
+++ b/make/ly-vars.make
@@ -3,14 +3,14 @@
 # empty
 
 # huh ? these are for documentation?!
-TELY_FILES := $(wildcard *.tely)
+TELY_FILES := $(call src-wildcard,*.tely)
 
 OMF_FILES += $(foreach format, html pdf ps.gz, $(foreach f, $(TELY_FILES), $(outdir)/$(f:.tely=.$(format)).omf))
 
-ITELY_FILES := $(wildcard *.itely)
-ITEXI_FILES := $(wildcard *.itexi)
-LY_FILES := $(wildcard *.ly)
-ILY_FILES := $(wildcard *.ily)
+ITELY_FILES := $(call src-wildcard,*.itely)
+ITEXI_FILES := $(call src-wildcard,*.itexi)
+LY_FILES := $(call src-wildcard,*.ly)
+ILY_FILES := $(call src-wildcard,*.ily)
 
 TEXINFO_SOURCES += $(TELY_FILES) $(ITELY_FILES) $(ITEXI_FILES)
 
diff --git a/make/mutopia-vars.make b/make/mutopia-vars.make
index fd05f5444d..22c63ba39a 100644
--- a/make/mutopia-vars.make
+++ b/make/mutopia-vars.make
@@ -4,11 +4,11 @@ include $(make-dir)/lilypond-vars.make
 
 # LY_FILES is defined the LY make template.
 
-SCORE_LY_FILES = $(shell fgrep -l score *.ly)
+SCORE_LY_FILES = $(shell cd $(src-dir) && fgrep -l score *.ly)
 
-M4_FILES = $(wildcard *.m4)
-LYM4_FILES = $(wildcard *.lym4)
-EXTRA_DIST_FILES +=  $(M4_FILES) $(LYM4_FILES)
+M4_FILES = $(call src-wildcard,*.m4)
+LYM4_FILES = $(call src-wildcard,*.lym4)
+EXTRA_DIST_FILES += $(M4_FILES) $(LYM4_FILES)
 
 ly_examples=$(addprefix $(outdir)/, $(addsuffix .ly.txt, $(examples)))
 all_examples=$(examples)
-- 
2.39.5