From: Phil Holmes <mail@philholmes.net>
Date: Fri, 27 May 2011 13:33:07 +0000 (+0100)
Subject: Silences "Not a dir" messages in make website
X-Git-Tag: release/2.15.0-1~29
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2ce6c91206c9f60bdcccb64d988c3c7c17c6bb6c;p=lilypond.git

Silences "Not a dir" messages in make website

Also gets rid of the double slash in the non-translated directory
names.
---

diff --git a/make/website.make b/make/website.make
index 55e2331633..62ca4b803d 100644
--- a/make/website.make
+++ b/make/website.make
@@ -84,6 +84,11 @@ website-version:
 
 website-xrefs: website-version
 	for l in '' $(WEB_LANGS); do \
+		len="$${#l}" ; \
+		r="$$l"; \
+		if [ "$$len" -gt "0" ] ; then \
+			r="$$r"/; \
+		fi ; \
 		$(EXTRACT_TEXI_FILENAMES) \
 			-I $(top-src-dir)/Documentation \
 			-I $(top-src-dir)/Documentation/"$$l" \
@@ -99,7 +104,7 @@ website-xrefs: website-version
 				$(EXTRACT_TEXI_FILENAMES) \
 				-I $(top-src-dir)/Documentation \
 				-I $(top-src-dir)/Documentation/"$$l" \
-				-I $(top-src-dir)/Documentation/"$$l"/"$$d" \
+				-I $(top-src-dir)/Documentation/"$$r""$$d" \
 				--known-missing-files=$(top-src-dir)/scripts/build/website-known-missing-files.txt \
 			  $(quiet-flag) \
 				-I $(OUT) -o $(OUT) "$$n" ; \
diff --git a/scripts/build/extract_texi_filenames.py b/scripts/build/extract_texi_filenames.py
index 33a31b7af5..7dd41eeade 100644
--- a/scripts/build/extract_texi_filenames.py
+++ b/scripts/build/extract_texi_filenames.py
@@ -66,6 +66,7 @@ include_path = ['.',]
 master_map_file = ''
 known_missing_files = []
 known_missing_files_file = ''
+docs_without_directories = ['changes', 'music-glossary']
 suppress_output = False
 initial_map = {}
 for opt in options_list:
@@ -77,7 +78,12 @@ for opt in options_list:
         if os.path.isdir (a):
             include_path.append (a)
         else:
-            print 'NOT A DIR from: ', os.getcwd (), a
+            path_list = a.split('/')
+            file_name = path_list[len(path_list)-1]
+            if not (file_name in docs_without_directories):
+                print a, 'is not a directory.'
+                print 'Please consider adding it to the list of '
+                print 'known missing files in extract_texi_filename.py.'
     elif o == '-o' or o == '--output':
         outdir = a
     elif o == '-s' or o == '--split':