* Documentation/user/refman.itely: Compile fix for \mark #'(music ...).

* Documentation/user/internals.itely: Use ly-set-mus-property!.

* cygwin/mknetrel: New file.

* Documentation/windows/fix-suffixes.sh:
* buildscripts/walk.sh: Junk.

* aclocal.m4: Regenerate.

* stepmake/stepmake/topdocs-targets.make:
* stepmake/stepmake/help2man-rules.make:
* stepmake/stepmake/generic-vars.make:
* stepmake/make/stepmake.make:
* Documentation/user/GNUmakefile:
* make/stepmake.make:
* make/lilypond-vars.make:
* GNUmakefile.in:
* stepmake/aclocal.m4: Remove builddir cruftyness.

* stepmake/stepmake/c++-rules.make: Use ALL_CXXFLAGS, to guard
agains user override of CXXFLAGS.

* stepmake/stepmake/c++-vars.make (ALL_CXXFLAGS): Include CXXFLAGS.

* stepmake/stepmake/c-rules.make: Use ALL_CFLAGS, to guard
against user override of CFLAGS.

* stepmake/stepmake/c-vars.make (ALL_CFLAGS): Include CFLAGS.

9 files changed, 31 insertions, 46 deletions

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index e8aeb960a9..33babcc409 100644
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -285,7 +285,7 @@ AC_DEFUN(STEPMAKE_END, [
 
     # regular in-place build
     # test for srcdir_build = yes ?
-    if test "$builddir" = "."; then
+    if test "$srcdir_build" = "yes"; then
 	rm -f $srcdir/GNUmakefile
 	cp $srcdir/GNUmakefile.in $srcdir/GNUmakefile
 	chmod 444 $srcdir/GNUmakefile
@@ -468,13 +468,13 @@ AC_DEFUN(STEPMAKE_INIT, [
 	AC_MSG_RESULT(Stepmake package!)
 
 	AC_MSG_CHECKING(builddir)
+	builddir="`pwd`"
 	if test "$srcdir" = "."; then
-	    builddir=.
+	    srcdir_build=yes
 	else
-	    absolute_builddir="`pwd`"
-	    package_absolute_builddir="`dirname $absolute_builddir`"
+	    srcdir_build=no
+	    package_builddir="`dirname $builddir`"
 	    package_srcdir="`dirname  $srcdir`"
-	    builddir="`dirname $package_srcdir`/`basename $package_absolute_builddir`/`basename $absolute_builddir`"
 	fi
 	AC_MSG_RESULT($builddir)
 
@@ -486,31 +486,20 @@ AC_DEFUN(STEPMAKE_INIT, [
         AC_MSG_RESULT($PACKAGE)
 
 	AC_MSG_CHECKING(builddir)
+	builddir="`pwd`"
 	if test "$srcdir" = "."; then
-	    builddir=.
-	    srcdir_build=no
-	else
-	    absolute_builddir="`pwd`"
-#	    builddir="`dirname  $srcdir`/`basename $absolute_builddir`"
-	    builddir="`bash $srcdir/buildscripts/walk.sh \"$srcdir\"`"
 	    srcdir_build=yes
+	else
+	    srcdir_build=no
 	fi
 	AC_MSG_RESULT($builddir)
-	if expr "$srcdir" : '/' > /dev/null 2>&1; then
-	    absolute_srcdir=yes
-	    STEPMAKE_WARN(Absolute --srcdir specified: $srcdir)
-	fi
 
 	AC_MSG_CHECKING(for stepmake)
 	# Check for installed stepmake
 	if test -d $stepmake; then
 	    AC_MSG_RESULT($stepmake)
 	else
-	    if test "$absolute_srcdir" != "yes"; then
-		stepmake='$(depth)'/$srcdir/stepmake
-	    else
-		stepmake=$srcdir/stepmake
-	    fi
+	    stepmake="`cd $srcdir/stepmake; pwd`"
 	    AC_MSG_RESULT($srcdir/stepmake  ($datadir/stepmake not found))
 	fi
 
diff --git a/stepmake/make/stepmake.make b/stepmake/make/stepmake.make
index f0fb538cab..572ff3ef1b 100644
--- a/stepmake/make/stepmake.make
+++ b/stepmake/make/stepmake.make
@@ -28,26 +28,23 @@ endif
 ifdef config
   configuration=$(config)
 else
-  ifeq ($(builddir),.)
+  ifeq ($(builddir),)
     configuration=$(depth)/config$(CONFIGSUFFIX).make
   else
-    # user package
-    configuration=$(depth)/$(builddir)/config$(CONFIGSUFFIX).make
-    # stepmake package
-    configuration=$(depth)/../$(builddir)/stepmake/config$(CONFIGSUFFIX).make
+    configuration=$(builddir)/config$(CONFIGSUFFIX).make
   endif
 endif
 
-include $(configuration)
-
-ifeq ($(builddir),.)
-  outroot=$(builddir)
+ifeq ($(builddir),)
+  outroot=.
 else
-  outroot=$(depth)/$(builddir)/$(patsubst $(shell cd $(depth); pwd)%,%,$(shell cd .; pwd))
+  outroot=$(builddir)/$(patsubst $(shell cd $(depth); pwd)%,%,$(pwd))
 endif
 
+include $(configuration)
+
 outdir=$(outroot)/$(outbase)
-config_h=$(depth)/$(builddir)/config$(CONFIGSUFFIX).h
+config_h=$(builddir)/config$(CONFIGSUFFIX).h
 
 # The outdir that was configured for: best guess to find binaries
 outconfbase=out$(CONFIGSUFFIX)
diff --git a/stepmake/stepmake/c++-rules.make b/stepmake/stepmake/c++-rules.make
index 1696b2e0aa..1bec4365b2 100644
--- a/stepmake/stepmake/c++-rules.make
+++ b/stepmake/stepmake/c++-rules.make
@@ -1,16 +1,16 @@
 .SUFFIXES: .cc .dep .hh .ll .o .so .yy
 
 $(outdir)/%.o: %.cc
-	$(DO_O_DEP) $(CXX) -c $(CXXFLAGS) -o $@ $<
+	$(DO_O_DEP) $(CXX) -c $(ALL_CXXFLAGS) -o $@ $<
 
 $(outdir)/%.o: $(outdir)/%.cc
-	$(DO_O_DEP) $(CXX) -c $(CXXFLAGS) -o $@ $<
+	$(DO_O_DEP) $(CXX) -c $(ALL_CXXFLAGS) -o $@ $<
 
 $(outdir)/%.lo: %.cc
-	$(DO_LO_DEP) $(CXX) -c $(CXXFLAGS) $(PIC_FLAGS) -o $@ $<
+	$(DO_LO_DEP) $(CXX) -c $(ALL_CXXFLAGS) $(PIC_FLAGS) -o $@ $<
 
 $(outdir)/%.lo: $(outdir)/%.cc
-	$(DO_LO_DEP) $(CXX) -c $(CXXFLAGS) $(PIC_FLAGS) -o $@ $<
+	$(DO_LO_DEP) $(CXX) -c $(ALL_CXXFLAGS) $(PIC_FLAGS) -o $@ $<
 
 $(outdir)/%.cc: %.yy
 	$(BISON) $<
diff --git a/stepmake/stepmake/c++-vars.make b/stepmake/stepmake/c++-vars.make
index 3dfe6819b1..901e041b6b 100644
--- a/stepmake/stepmake/c++-vars.make
+++ b/stepmake/stepmake/c++-vars.make
@@ -8,7 +8,7 @@ include $(stepdir)/compile-vars.make
 # EXTRA_CXXFLAGS= -Wall -Winline -W -Wmissing-prototypes -Wmissing-declarations -Wconversion
 EXTRA_CXXFLAGS= -Wall  -W -Wmissing-prototypes -Wconversion
 
-CXXFLAGS = $(ICFLAGS) $(DEFINES) $(addprefix -I,$(INCLUDES)) $(USER_CFLAGS) $(EXTRA_CFLAGS) $(MODULE_CFLAGS) $($(PACKAGE)_CFLAGS) $($(PACKAGE)_CXXFLAGS) $(USER_CXXFLAGS) $(EXTRA_CXXFLAGS) $(MODULE_CXXFLAGS)
+ALL_CXXFLAGS = $(CXXFLAGS) $(ICFLAGS) $(DEFINES) $(addprefix -I,$(INCLUDES)) $(USER_CFLAGS) $(EXTRA_CFLAGS) $(MODULE_CFLAGS) $($(PACKAGE)_CFLAGS) $($(PACKAGE)_CXXFLAGS) $(USER_CXXFLAGS) $(EXTRA_CXXFLAGS) $(MODULE_CXXFLAGS)
 
 # template files:
 TCC_FILES := $(wildcard *.tcc)
diff --git a/stepmake/stepmake/c-rules.make b/stepmake/stepmake/c-rules.make
index fa16d4f6ee..8a95ef6a9e 100644
--- a/stepmake/stepmake/c-rules.make
+++ b/stepmake/stepmake/c-rules.make
@@ -1,16 +1,16 @@
 .SUFFIXES: .c .dep .h .l .lo .o .so .y
 
 $(outdir)/%.o: %.c
-	$(DO_O_DEP) $(CC) -c $(CFLAGS) -o $@ $<
+	$(DO_O_DEP) $(CC) -c $(ALL_CFLAGS) -o $@ $<
 
 $(outdir)/%.o: $(outdir)/%.c
-	$(DO_O_DEP) $(CC) -c $(CFLAGS) -o $@ $<
+	$(DO_O_DEP) $(CC) -c $(ALL_CFLAGS) -o $@ $<
 
 $(outdir)/%.lo: %.c
-	$(DO_LO_DEP) $(CC) -c $(CFLAGS) $(PIC_FLAGS) -o $@ $<
+	$(DO_LO_DEP) $(CC) -c $(ALL_CFLAGS) $(PIC_FLAGS) -o $@ $<
 
 $(outdir)/%.lo: %.c
-	$(DO_LO_DEP) $(CC) -c $(CFLAGS) $(PIC_FLAGS) -o $@ $<
+	$(DO_LO_DEP) $(CC) -c $(ALL_CFLAGS) $(PIC_FLAGS) -o $@ $<
 
 $(outdir)/%.c: %.y
 	$(BISON) $<
diff --git a/stepmake/stepmake/c-vars.make b/stepmake/stepmake/c-vars.make
index 2b25636bba..2637bf2332 100644
--- a/stepmake/stepmake/c-vars.make
+++ b/stepmake/stepmake/c-vars.make
@@ -13,4 +13,4 @@ TAGS_FILES += $(C_FILES) $(H_FILES)
 
 ALL_C_SOURCES += $(H_FILES) $(C_FILES) $(Y_FILES) $(L_FILES)
 
-CFLAGS = $(ICFLAGS) $(DEFINES) $(addprefix -I,$(INCLUDES)) $(USER_CFLAGS) $(EXTRA_CFLAGS) $(MODULE_CFLAGS)
+ALL_CFLAGS = $(CFLAGS) $(ICFLAGS) $(DEFINES) $(addprefix -I,$(INCLUDES)) $(USER_CFLAGS) $(EXTRA_CFLAGS) $(MODULE_CFLAGS)
diff --git a/stepmake/stepmake/generic-vars.make b/stepmake/stepmake/generic-vars.make
index 25186b1cd3..7b457f3c5a 100644
--- a/stepmake/stepmake/generic-vars.make
+++ b/stepmake/stepmake/generic-vars.make
@@ -8,7 +8,6 @@ ifeq ($(topdir),)
 abs-srcdir := $(shell cd $(depth); pwd)
 #deprecated
 topdir := $(abs-srcdir)
-abs-builddir := $(shell cd $(depth)/$(builddir); pwd)
 endif
 pwd := $(shell pwd)
 
diff --git a/stepmake/stepmake/help2man-rules.make b/stepmake/stepmake/help2man-rules.make
index 8f90dc312a..cbb34cea98 100644
--- a/stepmake/stepmake/help2man-rules.make
+++ b/stepmake/stepmake/help2man-rules.make
@@ -13,7 +13,7 @@ endif
 
 $(outdir)/%.1: $(outdir)/%
 	echo "generating man page from --help"
-	@$(PERL) $(depth)/$(builddir)/buildscripts/$(outbase)/help2man $< > $@ || \
+	@$(PERL) $(builddir)/buildscripts/$(outbase)/help2man $< > $@ || \
 	(echo ""; echo "Apparently the man pages failed to build. This is";\
 	echo "no problem, since they don't contain any information anyway.";\
 	echo "Please run make again, and be prepared for NO manual pages.")
diff --git a/stepmake/stepmake/topdocs-targets.make b/stepmake/stepmake/topdocs-targets.make
index ebb99358d0..ca8bd0b4d0 100644
--- a/stepmake/stepmake/topdocs-targets.make
+++ b/stepmake/stepmake/topdocs-targets.make
@@ -3,9 +3,9 @@ default: local-doc
 
 copy-to-top:  $(TO_TOP_FILES)
 	$(foreach i, $(TO_TOP_FILES), \
-	  cp $(i) $(depth)/$(builddir) && ) true
-	-cp $(outroot)/out-www/*png $(outroot)/out-www/index.html $(depth)/$(builddir)  
-	-cp $(outdir)/*png $(outdir)/index.html $(depth)/$(builddir)  # don't fail when not making website
+	  cp $(i) $(builddir) && ) true
+	-cp $(outroot)/out-www/*png $(outroot)/out-www/index.html $(builddir)
+	-cp $(outdir)/*png $(outdir)/index.html $(builddir)  # don't fail when not making website
 
 local-WWW: $(HTML_FILES) copy-to-top
 # we want footers even if website builds (or is built) partly