Build: end directories in their bare names and avoid some double slashes in logs.

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index e061e629c836bf98e3cb1764c98069d62820746d..d4246294e5d7d2d3ab2c45602bee8cd9ca339324 100644 (file)
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -84,7 +84,7 @@ INFO_FILES = $(INFO_DOCS:%=$(outdir)/%.info)
 
 ifeq ($(out),www)
 INFO_IMAGES_DIR = lilypond
-DEST_INFO_IMAGES_SUBDIR = Documentation/
+DEST_INFO_IMAGES_SUBDIR = Documentation
 endif
 
 include $(depth)/make/stepmake.make

diff --git a/Documentation/pictures/pdf/GNUmakefile b/Documentation/pictures/pdf/GNUmakefile
index e81f999cc1646c9b87f89b65dd49e24290cb31f7..72ac2bcc88a0dab64600b2501046f4022a2f01b7 100644 (file)
--- a/Documentation/pictures/pdf/GNUmakefile
+++ b/Documentation/pictures/pdf/GNUmakefile
@@ -1,4 +1,4 @@
-depth = ../../../
+depth = ../../..
 
 PDF_FILES = $(call src-wildcard,*.pdf)
 

diff --git a/GNUmakefile.in b/GNUmakefile.in
index ca3d09938459cb80cd72e8b851ef6ca8dfbda97d..f8e1d15e7ca6a81516b41bbf3f0e5653c98fa3cd 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -70,8 +70,8 @@ local-clean-ChangeLog:
 
 dist-toplevel-txt-files: top-doc
        -mkdir -p $(distdir)
-       ln $(TOPDOC_TXT_FILES) $(distdir)/
-       ln $(top-src-dir)/stepmake/aclocal.m4 $(distdir)/
+       ln $(TOPDOC_TXT_FILES) $(distdir)
+       ln $(top-src-dir)/stepmake/aclocal.m4 $(distdir)
 
 info:
        $(foreach d, $(INFO_DIRECTORIES),$(MAKE) -C $(d) out=www info && ) true
@@ -101,7 +101,7 @@ ifeq ($(out),www)
 # installed in non-recursing target from TOP-SRC-DIR
 install-WWW:
        -$(INSTALL) -m 755 -d $(DESTDIR)$(webdir)
-       rsync -rl --exclude='*.signature' $(outdir)/offline-root/ $(DESTDIR)$(webdir)
+       rsync -rl --exclude='*.signature' $(outdir)/offline-root $(DESTDIR)$(webdir)
        $(MAKE) -C Documentation omf-local-install
 
 install-info-WWW:
@@ -210,7 +210,7 @@ $(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-fo
        rm -f $(tree-share-prefix)/fonts/type1/* &&  \
                cd $(tree-share-prefix)/fonts/otf && \
                ln -s ../../../../../../mf/$(outconfbase)/*.otf .
-       -cd $(tree-share-prefix)/fonts/ && \
+       -cd $(tree-share-prefix)/fonts && \
                ln -s ../../../../../mf/$(outconfbase)/fonts.conf .
        -cd $(tree-share-prefix)/fonts/svg && \
                ln -s ../../../../../../mf/$(outconfbase)/*.svg .
@@ -253,7 +253,7 @@ test:
        @echo
        @echo '        grep sourcefilename `grep -L systems.texi out/lybook-testdb/*/*log|sed s/log/ly/g`'
        @echo
-       $(MAKE) -C input/regression/ out=test local-test
+       $(MAKE) -C input/regression out=test local-test
        $(MAKE) -C input/regression/musicxml out=test local-test
        $(MAKE) -C input/regression/abc2ly out=test local-test
        $(MAKE) -C input/regression/lilypond-book out=test local-test
@@ -264,7 +264,7 @@ test-baseline:
        fi
        $(MAKE)
        $(MAKE) test
-       $(MAKE) out=test -C input/regression/ local-test-baseline
+       $(MAKE) out=test -C input/regression local-test-baseline
        $(MAKE) out=test -C input/regression/musicxml local-test-baseline
        $(MAKE) out=test -C input/regression/abc2ly local-test-baseline
        $(MAKE) out=test -C input/regression/lilypond-book local-test-baseline
@@ -274,7 +274,7 @@ test-baseline:
 local-check: test
        rm -rf $(RESULT_DIR)
        mkdir -p $(RESULT_DIR)
-       $(buildscript-dir)/output-distance --create-images --output-dir $(RESULT_DIR) input/regression/out-test-baseline input/regression/out-test/
+       $(buildscript-dir)/output-distance --create-images --output-dir $(RESULT_DIR) input/regression/out-test-baseline input/regression/out-test
        @find input ly -name '*.ly' -print |grep -v 'out.*/' | xargs grep '\\version' -L | grep -v "standard input" |sed 's/^/**** Missing version: /g'
 
 
@@ -286,7 +286,7 @@ test-redo:
        $(MAKE) check
 
 test-clean: test-snippets-clean
-       $(MAKE) -C input/regression/ out=test clean
+       $(MAKE) -C input/regression out=test clean
 
 snippets-clean:
        rm -rf out/lybook-db

diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index f3fb922b53f34184794e7d0e0ff84a909db83c03..4056eefb938bf6de297735f2202a6d44f8802be2 100644 (file)
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -57,7 +57,7 @@ default:
 
 $(outdir)/libstdc++.a:
        rm -f $@
-       ln -s `$(CXX) -print-file-name=libstdc++.a` $(outdir)/
+       ln -s `$(CXX) -print-file-name=libstdc++.a` $(outdir)
 
 ifeq ($(LINK_GXX_STATICALLY),yes)
 $(outdir)/lilypond: $(outdir)/libstdc++.a

diff --git a/ly/GNUmakefile b/ly/GNUmakefile
index fd82839f736e8ba93b9b0d320bc965979fde1084..afdbac3478924d42a9d04b9edda0211b52667c44 100644 (file)
--- a/ly/GNUmakefile
+++ b/ly/GNUmakefile
@@ -3,7 +3,7 @@ depth = ..
 INI_FILES = $(LY_FILES)
 EXTRA_DIST_FILES = $(SCM_FILES)
 
-INSTALLATION_DIR=$(local_lilypond_datadir)/ly/
+INSTALLATION_DIR=$(local_lilypond_datadir)/ly
 INSTALLATION_FILES=$(INI_FILES)
 
 STEPMAKE_TEMPLATES=install

diff --git a/make/ly-rules.make b/make/ly-rules.make
index 19b00f05b222ed41653b2f40fd7345e91c30b296..0df0643ee3158ec5ad2c0a685d752942ea30d18e 100644 (file)
--- a/make/ly-rules.make
+++ b/make/ly-rules.make
@@ -2,7 +2,7 @@
 
 # TODO: fix hardcoded out/ ?
 LYS_OUTPUT_OPTION= --lily-output-dir $(LYS_OUTPUT_DIR)
-LYS_OUTPUT_DIR=$(top-build-dir)/out/lybook-db/
+LYS_OUTPUT_DIR=$(top-build-dir)/out/lybook-db
 LILYPOND_BOOK_FLAGS += $(LYS_OUTPUT_OPTION)
 $(outdir)/%.latex: %.doc $(INIT_LY_SOURCES) $(SCHEME_SOURCES)
        LILYPOND_VERSION=$(TOPLEVEL_VERSION) $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BOOK_PROCESS) $(LILYPOND_BOOK_LILYPOND_FLAGS)' --output=$(outdir) $(LILYPOND_BOOK_FLAGS) $<

diff --git a/make/website.make b/make/website.make
index 02ff0da62c9e7597cdd55270047c0903b1624061..2ac54c5a4308354298444f5cb3e8b5ce889ac0e8 100644 (file)
--- a/make/website.make
+++ b/make/website.make
@@ -16,18 +16,18 @@ ifeq ($(WEBSITE_ONLY_BUILD),1)
   top-htaccess=$(trusted-dir)/lilypond.org.htaccess
   dir-htaccess=$(trusted-dir)/website-dir.htaccess
   TEXI2HTML_PROGRAM=$(HOME)/usr/bin/texi2html
-  EXAMPLES=$(HOME)/lilypond/media/ly-examples/
+  EXAMPLES=$(HOME)/lilypond/media/ly-examples
   PICTURES=$(HOME)/lilypond/media/pictures
 else
   ### for normal git
-  script-dir=$(top-src-dir)/scripts/build/
+  script-dir=$(top-src-dir)/scripts/build
   texi2html-init-file=$(top-src-dir)/Documentation/lilypond-texi2html.init
   top-htaccess=$(top-src-dir)/Documentation/web/server/lilypond.org.htaccess
   dir-htaccess=$(top-src-dir)/Documentation/web/server/website-dir.htaccess
   include $(config_make)
   # I assume this is run from top-build-dir
-  EXAMPLES=Documentation/web/ly-examples/out-www/
-  PICTURES=Documentation/pictures/out-www/
+  EXAMPLES=Documentation/web/ly-examples/out-www
+  PICTURES=Documentation/pictures/out-www
 endif
 
 
@@ -47,7 +47,7 @@ MASS_LINK=python $(script-dir)/mass-link.py
 WEB_POST=python $(script-dir)/website_post.py
 WEB_BIBS=python $(script-dir)/bib2texi.py
 
-SERVER_FILES=$(top-src-dir)/Documentation/web/server/
+SERVER_FILES=$(top-src-dir)/Documentation/web/server
 
 # don't include web
 MANUALS=$(wildcard $(top-src-dir)/Documentation/*.tely)
@@ -64,7 +64,7 @@ website-version:
 website-xrefs: website-version
        for l in '' $(WEB_LANGS); do \
                $(EXTRACT_TEXI_FILENAMES) \
-                       -I $(top-src-dir)/Documentation/ \
+                       -I $(top-src-dir)/Documentation \
                        -I $(top-src-dir)/Documentation/"$$l" \
                        -I $(OUT) -o $(OUT) --split=node \
                        $(top-src-dir)/Documentation/"$$l"/web.texi ;\
@@ -74,20 +74,20 @@ website-xrefs: website-version
                        d=`basename "$$b" .tely`; \
                        if [ -e "$$n" ] ; then \
                                $(EXTRACT_TEXI_FILENAMES) \
-                               -I $(top-src-dir)/Documentation/ \
+                               -I $(top-src-dir)/Documentation \
                                -I $(top-src-dir)/Documentation/"$$l" \
-                               -I $(top-src-dir)/Documentation/"$$l"/"$$d"/ \
+                               -I $(top-src-dir)/Documentation/"$$l"/"$$d" \
                                -I $(OUT) -o $(OUT) "$$n" ; \
                        fi ; \
                done; \
        done;
 
 website-bibs: website-version
-       BSTINPUTS=$(top-src-dir)/Documentation/web/ \
+       BSTINPUTS=$(top-src-dir)/Documentation/web \
                $(WEB_BIBS) -s web \
                -o $(OUT)/others-did.itexi \
                $(top-src-dir)/Documentation/web/others-did.bib
-       BSTINPUTS=$(top-src-dir)/Documentation/web/ \
+       BSTINPUTS=$(top-src-dir)/Documentation/web \
                $(WEB_BIBS) -s web \
                -o $(OUT)/we-wrote.itexi \
                $(top-src-dir)/Documentation/web/we-wrote.bib
@@ -102,7 +102,7 @@ website-texinfo: website-version website-xrefs website-bibs
                $(TEXI2HTML) --prefix=index \
                        --split=section \
                        --I=$(top-src-dir)/Documentation/"$$l" \
-                       --I=$(top-src-dir)/Documentation/ \
+                       --I=$(top-src-dir)/Documentation \
                        --I=$(OUT) \
                        $$langopt \
                        --init-file=$(texi2html-init-file) \
@@ -114,11 +114,11 @@ website-texinfo: website-version website-xrefs website-bibs
 
 
 website-css:
-       cp $(top-src-dir)/Documentation/css/*.css $(OUT)/website/
+       cp $(top-src-dir)/Documentation/css/*.css $(OUT)/website
 
 website-pictures:
-       mkdir -p $(OUT)/website/pictures/
-       cp $(PICTURES)/* $(OUT)/website/pictures/
+       mkdir -p $(OUT)/website/pictures
+       cp $(PICTURES)/* $(OUT)/website/pictures
        ln -sf website/pictures $(OUT)/pictures
 
 website-examples:
@@ -126,11 +126,11 @@ website-examples:
        cp $(EXAMPLES)/* $(OUT)/website/ly-examples
 
 web-post:
-       $(WEB_POST) $(OUT)/website/
+       $(WEB_POST) $(OUT)/website
 
 website: website-texinfo website-css website-pictures website-examples web-post
-       cp $(SERVER_FILES)/favicon.ico $(OUT)/website/
-       cp $(SERVER_FILES)/robots.txt $(OUT)/website/
+       cp $(SERVER_FILES)/favicon.ico $(OUT)/website
+       cp $(SERVER_FILES)/robots.txt $(OUT)/website
        cp $(top-htaccess) $(OUT)/.htaccess
        cp $(dir-htaccess) $(OUT)/website/.htaccess
 

diff --git a/ps/GNUmakefile b/ps/GNUmakefile
index 8967ca4a2d5feb55780009fede1a706ce7e74366..4bdc92c75e584159dcc43910360abced062efc11 100644 (file)
--- a/ps/GNUmakefile
+++ b/ps/GNUmakefile
@@ -5,7 +5,7 @@ PS_FILES = $(call src-wildcard,*.ps)
 STEPMAKE_TEMPLATES=install
 EXTRA_DIST_FILES = $(PS_FILES)
 
-INSTALLATION_DIR=$(local_lilypond_datadir)/ps/
+INSTALLATION_DIR=$(local_lilypond_datadir)/ps
 INSTALLATION_FILES=$(PS_FILES)
 
 include $(depth)/make/stepmake.make

diff --git a/scm/GNUmakefile b/scm/GNUmakefile
index d3f055f77f9bfa8c6fea9bb4699c9be8ab0b133f..0c1965293a84324ed5aa0d44148cf5c668e7c519 100644 (file)
--- a/scm/GNUmakefile
+++ b/scm/GNUmakefile
@@ -2,7 +2,7 @@
 
 depth = ..
 
-INSTALLATION_DIR=$(local_lilypond_datadir)/scm/
+INSTALLATION_DIR=$(local_lilypond_datadir)/scm
 INSTALLATION_FILES=$(SCM_FILES)
 
 XGETTEXT_FLAGS = --language=Scheme

diff --git a/scripts/auxiliar/build-coverage.sh b/scripts/auxiliar/build-coverage.sh
index f61ff649dca336346a0863bf24c67d4a128bb741..d774bee3fdee601350f379418db61543fc69e19b 100755 (executable)
--- a/scripts/auxiliar/build-coverage.sh
+++ b/scripts/auxiliar/build-coverage.sh
@@ -18,7 +18,7 @@ else
   find -name '*.gcda' -exec rm  '{}' ';'
 fi
 
-mkdir -p scripts/out-cov/
+mkdir -p scripts/out-cov
 touch scripts/out-cov/midi2ly scripts/out-cov/midi2ly.1
 make conf=cov -j2 &&  \
   make conf=cov test-clean OUT_TEST=testcov LILYPOND_JOBS= && \
@@ -42,11 +42,11 @@ mv $depth/input/regression/out-testcov/*.scm.cov .
 ln $depth/ly/*.ly .
 ln $depth/lily/out-cov/*[ch] .
 mkdir include
-ln $depth/lily/include/* include/
-ln $depth/flower/include/* include/
+ln $depth/lily/include/* include
+ln $depth/flower/include/* include
 for a in *[cl] *.yy
 do
-   gcov -o $depth/lily/out-cov/  -p $a > $a.gcov-summary
+   gcov -o $depth/lily/out-cov  -p $a > $a.gcov-summary
 done 
 
 $depth/scripts/auxiliar/coverage.py --uncovered *.cc > uncovered.txt

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 9cb66d73ac389d417015888e26c113565653f570..c06224717b002f795b4ef184a37f48931c1b15f9 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -426,7 +426,7 @@ EOF
 
        
        cat <<EOF > GNUmakefile
-depth = ./
+depth = .
 include config\$(if \$(conf),-\$(conf),).make
 include \$(configure-srcdir)/GNUmakefile.in
 EOF

diff --git a/stepmake/stepmake/documentation-vars.make b/stepmake/stepmake/documentation-vars.make
index 4c572c214a4e452cec7118e46d65ac370efab610..b22da2e9f50706118954ef800ca1e2526d079f47 100644 (file)
--- a/stepmake/stepmake/documentation-vars.make
+++ b/stepmake/stepmake/documentation-vars.make
@@ -1,4 +1,4 @@
-at-dir = $(doc-dir)/
+at-dir = $(doc-dir)
 at-ext = .in
 
 EXTRA_DIST_FILES += $(call src-wildcard,*.ihtml)

diff --git a/stepmake/stepmake/install-targets.make b/stepmake/stepmake/install-targets.make
index 89c4129f1d687a9696be973816471d6232adb0c5..1344a2f52407801724be203f9195c7647be8a210 100644 (file)
--- a/stepmake/stepmake/install-targets.make
+++ b/stepmake/stepmake/install-targets.make
@@ -10,7 +10,7 @@ local-install-files: $(INSTALLATION_FILES)
        $(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))/ )
+               $(INSTALLPY) -m 644  $(addprefix $(src-dir), $(INSTALLATION_FILES$(suff))) $(DESTDIR)$(INSTALLATION_DIR$(suff))/ )
        $(POST_INSTALL)
 
 local-uninstall: local-uninstall-outfiles local-uninstall-files

diff --git a/stepmake/stepmake/makedir-vars.make b/stepmake/stepmake/makedir-vars.make
index 7a78a593448218afe8e630ed424606d83c7023e8..ac5d1b6e8735d2981af0b4ea4d6b9cc32561245c 100644 (file)
--- a/stepmake/stepmake/makedir-vars.make
+++ b/stepmake/stepmake/makedir-vars.make
@@ -12,7 +12,7 @@ EXTRA_DIST_FILES += $(MAKE_FILES)
 # these two outdir FILES are distributed, since they make sense to have
 # without running configure and make.
 
-at-dir = $(doc-dir)/
+at-dir = $(doc-dir)
 at-ext = .in
 
 

diff --git a/stepmake/stepmake/texinfo-targets.make b/stepmake/stepmake/texinfo-targets.make
index df3fe8347ea143aa287625a27335bc8a8fe46f61..487ee97e491998257c5f4f108770064b18f93b05 100644 (file)
--- a/stepmake/stepmake/texinfo-targets.make
+++ b/stepmake/stepmake/texinfo-targets.make
@@ -43,7 +43,7 @@ install-info-images:
 # remove $(infodir)/$(INFO_IMAGES_DIR) in case it is a symlink
        -rm -f $(DESTDIR)$(infodir)/$(INFO_IMAGES_DIR)
        $(INSTALL) -d $(DESTDIR)$(infodir)/$(INFO_IMAGES_DIR)
-       rsync -r --include '[0-9a-f][0-9a-f]' --include '*.png' --exclude '*' $(outdir)/ $(DESTDIR)$(infodir)/$(INFO_IMAGES_DIR)/
+       rsync -r --include '[0-9a-f][0-9a-f]' --include '*.png' --exclude '*' $(outdir)/ $(DESTDIR)$(infodir)/$(INFO_IMAGES_DIR)
 
 uninstall-info-images:
        rm -f $(DESTDIR)$(infodir)/$(INFO_IMAGES_DIR) || rm -rf $(DESTDIR)$(infodir)/$(INFO_IMAGES_DIR)

diff --git a/stepmake/stepmake/toplevel-targets.make b/stepmake/stepmake/toplevel-targets.make
index 2ee7be573f69bdf10c33ae97d182ed82d8dd246d..d2748a97a3280e2e16ea575485ba9b2c40b2fe11 100644 (file)
--- a/stepmake/stepmake/toplevel-targets.make
+++ b/stepmake/stepmake/toplevel-targets.make
@@ -52,7 +52,7 @@ dist:
        chmod -R a+r $(distdir)
        chmod  a+x `find $(distdir) -type d -print`
        (cd ./$(depth)/$(outdir); $(TAR) -cf -  --owner=0 --group=0 $(DIST_NAME) | gzip -9 > $(DIST_NAME).tar.gz)
-       rm -rf $(distdir)/
+       rm -rf $(distdir)
 
 local-help:
        @echo "  config          rerun configure"

diff --git a/tex/GNUmakefile b/tex/GNUmakefile
index 64e2653bd9d227b0095c7f36e67df576d22317d9..51a54a43aa8f9a4b67e00f2cc862097aabb44f32 100644 (file)
--- a/tex/GNUmakefile
+++ b/tex/GNUmakefile
@@ -5,7 +5,7 @@ TEX_FILES = $(filter-out $(TEXINFO_FILES),$(call src-wildcard,*.tex))
 EXTRA_DIST_FILES = $(TEX_FILES) $(TEXINFO_FILES)
 STEPMAKE_TEMPLATES = install install-out
 
-INSTALLATION_DIR = $(local_lilypond_datadir)/tex/
+INSTALLATION_DIR = $(local_lilypond_datadir)/tex
 INSTALLATION_FILES = $(TEX_FILES)
 
 include $(depth)/make/stepmake.make