From: fred <fred>
Date: Wed, 27 Mar 2002 01:21:31 +0000 (+0000)
Subject: lilypond-1.5.10
X-Git-Tag: release/1.5.59~546
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9747b632831bc93862ac5710823c4c3b7e693c20;p=lilypond.git

lilypond-1.5.10
---

diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index c3d76bbc25..fffbc18c68 100644
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -1,5 +1,3 @@
-# title	   makefile for lilypond
-# file	   lily/Makefile 
 
 depth = ..
 
diff --git a/make/asciifont-rules.make b/make/asciifont-rules.make
new file mode 100644
index 0000000000..f7eb2ed82b
--- /dev/null
+++ b/make/asciifont-rules.make
@@ -0,0 +1,4 @@
+
+$(outdir)/%.afm: %.af
+	grep '[[:cntrl:]]' $< | sed 's/^[[:cntrl:]] *//' > $@
+#	grep '[[:cntrl:]]' $< | sed 's/^. *//' > $@
diff --git a/make/asciifont-targets.make b/make/asciifont-targets.make
new file mode 100644
index 0000000000..1bb8bf6d7f
--- /dev/null
+++ b/make/asciifont-targets.make
@@ -0,0 +1 @@
+# empty
diff --git a/make/asciifont-vars.make b/make/asciifont-vars.make
new file mode 100644
index 0000000000..f414fcf639
--- /dev/null
+++ b/make/asciifont-vars.make
@@ -0,0 +1,2 @@
+AF_FILES := $(wildcard *.af)
+EXTRA_DIST_FILES += $(AF_FILES)
diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index a2a9463991..12ce227e8a 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -1,8 +1,7 @@
-# mf/Makefile
-
 depth = ..
 
-STEPMAKE_TEMPLATES=metafont metapost asciifont install install-out
+STEPMAKE_TEMPLATES=metafont metapost install install-out
+LOCALSTEPMAKE_TEMPLATES=asciifont
 include $(depth)/make/stepmake.make 
 
 AF_FILES = $(wildcard *.af) 
diff --git a/scripts/GNUmakefile b/scripts/GNUmakefile
index eb0687f223..a61a9b1d58 100644
--- a/scripts/GNUmakefile
+++ b/scripts/GNUmakefile
@@ -1,5 +1,3 @@
-# bin/Makefile
-
 depth = ..
 
 SEXECUTABLES=convert-ly lilypond-book ly2dvi abc2ly as2text etf2ly musedata2ly pmx2ly mup2ly
diff --git a/stepmake/bin/add-html-footer.py b/stepmake/bin/add-html-footer.py
index 6a08f29e0a..7c0f83c036 100644
--- a/stepmake/bin/add-html-footer.py
+++ b/stepmake/bin/add-html-footer.py
@@ -137,6 +137,37 @@ footer = compose (default_footer, footer_file) + built
 header_tag = '<!-- header_tag -->'
 footer_tag = '<!-- footer_tag -->'
 
+# Python < 1.5.2 compatibility
+#
+# On most platforms, this is equivalent to
+#`normpath(join(os.getcwd()), PATH)'.  *Added in Python version 1.5.2*
+if os.path.__dict__.has_key ('abspath'):
+	abspath = os.path.abspath
+else:
+	def abspath (path):
+		return os.path.normpath (os.path.join (os.getcwd (), path))
+
+
+def remove_self_ref (s):	
+	self_url = abspath (os.getcwd () + '/' + f)
+	#sys.stderr.write ('url0: %s\n' % self_url)
+	self_url = re.sub ('.*' + string.lower (package_name) + '[^/]*/',
+			 '', self_url)
+	#sys.stderr.write ('url1: %s\n' % self_url)
+	
+	#urg, ugly lily-specific toplevel index hack
+	self_url = re.sub ('.*topdocs/out-www/index.html', 'index.html', self_url)
+	#sys.stderr.write ('url2: %s\n' % self_url)
+
+	m = re.match ('.*?(<a href="[\./]*' + self_url + '#?[^"]*">)([^<]*)(</a>)',
+		      s, re.DOTALL)
+	while m:
+		#sys.stderr.write ('self: %s\n' % m.group (2))
+		s = s[:m.start (1)] + m.group (2) + s[m.end (3):]
+		m = re.match ('.*?(<a href="[\./]*' + self_url + '#?[^"]*">)([^<]*)(</a>)',
+			      s, re.DOTALL)
+	return s
+
 def do_file (f):
 	s = gulp_file (f)
 
@@ -197,6 +228,24 @@ def do_file (f):
 	s = re.sub ('@LOCALTIME@', localtime, s)
 	s = re.sub ('@MAIL_ADDRESS@', mail_address, s)
 
+	m = re.match ('.*?<!-- (@[a-zA-Z0-9_-]*@)=(.*?) -->', s, re.DOTALL)
+	while m:
+		at_var = m.group (1)
+		at_val = m.group (2)
+		#sys.stderr.write ('at: %s -> %s\n' % (at_var, at_val))
+		s = re.sub (at_var, at_val, s)
+		m = re.match ('.*?<!-- (@[a-zA-Z0-9_-]*@)=(.*?) -->', s, re.DOTALL)
+
+	# urg
+	# maybe find first node?
+	fallback_web_title = '-- --'
+	m = re.match ('.*?<title>\(.*?\)</title>', s, re.DOTALL)
+	if m:
+		fallback_web_title = m.group (1)
+	s = re.sub ('@WEB-TITLE@', fallback_web_title, s)
+	
+	s = remove_self_ref (s)
+
 	open (f, 'w').write (s)
 
 
diff --git a/stepmake/stepmake/automatically-configured.sub.make b/stepmake/stepmake/automatically-configured.sub.make
index 8b13789179..1bb8bf6d7f 100644
--- a/stepmake/stepmake/automatically-configured.sub.make
+++ b/stepmake/stepmake/automatically-configured.sub.make
@@ -1 +1 @@
-
+# empty
diff --git a/stepmake/stepmake/c++-files.make b/stepmake/stepmake/c++-files.make
index 8b13789179..1bb8bf6d7f 100644
--- a/stepmake/stepmake/c++-files.make
+++ b/stepmake/stepmake/c++-files.make
@@ -1 +1 @@
-
+# empty
diff --git a/stepmake/stepmake/c++-rules.make b/stepmake/stepmake/c++-rules.make
index 83b54258e0..1c7a0cc0db 100644
--- a/stepmake/stepmake/c++-rules.make
+++ b/stepmake/stepmake/c++-rules.make
@@ -1,6 +1,3 @@
-# title	   C++ rules
-# file	   make/C++_rules.make
-
 .SUFFIXES: .cc .o .hh .yy .ll  .dep
 
 # compile rules:
diff --git a/stepmake/stepmake/c++-targets.make b/stepmake/stepmake/c++-targets.make
index 139597f9cb..e032d7ee59 100644
--- a/stepmake/stepmake/c++-targets.make
+++ b/stepmake/stepmake/c++-targets.make
@@ -1,2 +1,2 @@
-
+# empty
 
diff --git a/stepmake/stepmake/c-rules.make b/stepmake/stepmake/c-rules.make
index a2bf496187..90013ec551 100644
--- a/stepmake/stepmake/c-rules.make
+++ b/stepmake/stepmake/c-rules.make
@@ -1,5 +1,3 @@
-# stepmake/C_rules.make
-
 .SUFFIXES: .c .o .h .y .l .dep
 
 $(outdir)/%.o: %.c
diff --git a/stepmake/stepmake/c-targets.make b/stepmake/stepmake/c-targets.make
index 5ff8b1d765..1bb8bf6d7f 100644
--- a/stepmake/stepmake/c-targets.make
+++ b/stepmake/stepmake/c-targets.make
@@ -1,2 +1 @@
-
-#empty.
+# empty
diff --git a/stepmake/stepmake/c-vars.make b/stepmake/stepmake/c-vars.make
index 4009610f31..7c5a9f0ef2 100644
--- a/stepmake/stepmake/c-vars.make
+++ b/stepmake/stepmake/c-vars.make
@@ -1,4 +1,3 @@
-
 # header files:
 H_FILES := $(wildcard *.h)
 C_FILES := $(wildcard *.c)
diff --git a/stepmake/stepmake/debian-vars.make b/stepmake/stepmake/debian-vars.make
index 6acddd5f26..e032d7ee59 100644
--- a/stepmake/stepmake/debian-vars.make
+++ b/stepmake/stepmake/debian-vars.make
@@ -1,2 +1,2 @@
-#empty
+# empty
 
diff --git a/stepmake/stepmake/documentation-rules.make b/stepmake/stepmake/documentation-rules.make
index 8cb7ce851d..81469e2e6f 100644
--- a/stepmake/stepmake/documentation-rules.make
+++ b/stepmake/stepmake/documentation-rules.make
@@ -1,5 +1,3 @@
-# Docrules.make
-
 # special rules for the documentation section.
 # There are too many to add to the general rules
 
diff --git a/stepmake/stepmake/documentation-vars.make b/stepmake/stepmake/documentation-vars.make
index a4efa4eb59..e0fb2420a7 100644
--- a/stepmake/stepmake/documentation-vars.make
+++ b/stepmake/stepmake/documentation-vars.make
@@ -1,4 +1,3 @@
-# Documentation files
 AT_FILES = $(BLURBS) # 
 at-dir = $(doc-dir)/
 at-ext = .in
diff --git a/stepmake/stepmake/executable-targets.make b/stepmake/stepmake/executable-targets.make
index 8c019e6f7a..89b06d48a8 100644
--- a/stepmake/stepmake/executable-targets.make
+++ b/stepmake/stepmake/executable-targets.make
@@ -1,8 +1,3 @@
-# Executable.make
-
-# dependency list of executable:
-#
-
 default: $(EXECUTABLE)
 
 $(EXECUTABLE): $(outdir)/config.h $(O_FILES) $(outdir)/version.hh
@@ -32,9 +27,3 @@ uninstallexe:
 	$(foreach a, $(SEXECUTABLES), rm -f $(bindir)/$(a) &&) true
 
 
-# Piss off.  Use MODULE_LIBS
-#
-# UGH. fucks up if $(outdir) not created.
-#
-#%/$(outdir)/library.a:
-#	$(MAKE) -C $(dir $@)/.. default
diff --git a/stepmake/stepmake/executable-vars.make b/stepmake/stepmake/executable-vars.make
index 784f8f603f..c94aeff482 100644
--- a/stepmake/stepmake/executable-vars.make
+++ b/stepmake/stepmake/executable-vars.make
@@ -1,6 +1,10 @@
-# empty
 LDFLAGS = $(ILDFLAGS) $(EXTRA_LDFLAGS) $(MODULE_LDFLAGS) $($(PACKAGE)_LDFLAGS)
 
 ## urg, silly name: library.a
 MODULE_LIBES =$(addprefix $(outdir)/../, $(addsuffix /$(outbase)/library.a, $(MODULE_LIBS)))
 LOADLIBES = $(MODULE_LIBES) $($(PACKAGE)_LIBES) $(EXTRA_LIBES)
+
+EXECUTABLE = $(outdir)/$(NAME)
+EXECUTABLES = $(notdir $(EXECUTABLE))
+
+
diff --git a/stepmake/stepmake/generic-rules.make b/stepmake/stepmake/generic-rules.make
index 48b0a0983d..1a19a4dc88 100644
--- a/stepmake/stepmake/generic-rules.make
+++ b/stepmake/stepmake/generic-rules.make
@@ -1,11 +1,3 @@
-# title	   generic make rules
-# file	   make/Rules.make
-
-# this is supposed to clear all suffixes:
-.SUFFIXES:
-
-
-
 $(outdir)/%: %.m4
 	$(M4) $< > $@
 
diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index d70710f8a3..5c7d038bf4 100644
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -1,6 +1,3 @@
-# title	   generic make targets
-# file	   make/Targets.make
-
 .PHONY : all clean config default diff dist doc exe help html lib TAGS\
 	 po
 
@@ -61,7 +58,6 @@ Make may be invoked from any subdirectory\n\
 Note that all commands recurse into SUBDIRS;\n\
 prepend \`local-' to do only cwd, eg: local-clean\n\
 "\
-#
 
 local-help:
 
@@ -132,8 +128,6 @@ installextradoc:
 	$(foreach i, $(EXTRA_DOC_FILES),\
 		cp -r $(i) $(prefix)/doc/$(package) &&) true
 
-include $(stepdir)/package.make
-
 include $(outdir)/dummy.dep $(DEP_FILES)
 
 $(outdir)/dummy.dep:
@@ -153,3 +147,22 @@ $(depth)/$(configuration).make: $(depth)/configure
 	@echo "************************************************************"
 	(cd $(depth); ./config.status)
 	touch $@		# do something for multiple simultaneous configs.
+
+
+deb:
+	$(MAKE) -C $(depth)/debian
+	cd $(depth) && debuild
+
+diff:
+	$(PYTHON) $(step-bindir)/package-diff.py  --outdir=$(topdir)/$(outdir) --package=$(topdir) $(makeflags)
+	-ln -f $(depth)/$(outdir)/$(distname).diff.gz $(patch-dir)
+
+release: 
+	$(PYTHON) $(step-bindir)/release.py --outdir=$(topdir)/$(outdir) --package=$(topdir)
+
+rpm: $(depth)/$(package-icon) dist
+	@echo "Assuming Red Hat system"	#FIXME: check distro, then issue rpm
+	$(MAKE) -C $(depth)/make
+	cd $(depth) && rmp -bb make/$(outdir)/lilypond.redhat.spec
+#	su -c 'rpm -tb $(depth)/$(outdir)/$(distname).tar.gz'
+
diff --git a/stepmake/stepmake/generic-vars.make b/stepmake/stepmake/generic-vars.make
index 9fd7e36d3e..8ee0efd874 100644
--- a/stepmake/stepmake/generic-vars.make
+++ b/stepmake/stepmake/generic-vars.make
@@ -1,12 +1,3 @@
-# title	   generic variables
-# file	   make/Variables.make
-#
-# do not change this file for site-wide extensions; please use 
-# make/$(outdir)/Site.make; 
-#
-# Any change in files in this directory (make/) would be distributed, if 
-# you do make dist 
-
 # directory names:
 
 # depth from group-dir
@@ -112,18 +103,6 @@ depfile = $(outdir)/$(subst .o,.dep,$(notdir $@))#
 DODEP=rm -f $(depfile); DEPENDENCIES_OUTPUT="$(depfile) $(outdir)/$(notdir $@)"
 #
 
-
-# generic target names:
-#
-ifdef NAME
-EXECUTABLE = $(outdir)/$(NAME)
-else
-EXECUTABLE =
-endif
-
-EXECUTABLES = $(notdir $(EXECUTABLE))
-
-
 #
 
 #replace to do stripping of certain objects
@@ -146,5 +125,16 @@ LOOP=$(foreach i,  $(SUBDIRS), $(MAKE) PACKAGE=$(PACKAGE) package=$(package) -C
 ETAGS_FLAGS= # -CT
 CTAGS_FLAGS=-h
 
-include $(stepdir)/files.make
+makeflags=$(patsubst %==, %, $(patsubst ---%,,$(patsubst ----%,,$(MAKEFLAGS:%=--%))))
+
+DEP_FILES := $(wildcard $(outdir)/*.dep)
+
+IN_FILES := $(wildcard *.in)
+SOURCE_FILES += $(IN_FILES)
+
+# Preprocessed .in documentation _FILES:
+OUTIN_FILES = $(addprefix $(outdir)/, $(IN_FILES:%.in=%))
+
+ALL_SOURCES = $(SOURCE_FILES)
+
 
diff --git a/stepmake/stepmake/install-out-rules.make b/stepmake/stepmake/install-out-rules.make
index 841db19676..1bb8bf6d7f 100644
--- a/stepmake/stepmake/install-out-rules.make
+++ b/stepmake/stepmake/install-out-rules.make
@@ -1,2 +1 @@
-
-#empty
+# empty
diff --git a/stepmake/stepmake/install-out-targets.make b/stepmake/stepmake/install-out-targets.make
index d4b42579c1..3abb38417b 100644
--- a/stepmake/stepmake/install-out-targets.make
+++ b/stepmake/stepmake/install-out-targets.make
@@ -1,4 +1,3 @@
-# install-out-targets.make
 
 local-install: local-install-files local-install-outfiles
 
diff --git a/stepmake/stepmake/install-out-vars.make b/stepmake/stepmake/install-out-vars.make
index 841db19676..1bb8bf6d7f 100644
--- a/stepmake/stepmake/install-out-vars.make
+++ b/stepmake/stepmake/install-out-vars.make
@@ -1,2 +1 @@
-
-#empty
+# empty
diff --git a/stepmake/stepmake/install-out.sub.make b/stepmake/stepmake/install-out.sub.make
index cd95c35f5b..43253fbf02 100644
--- a/stepmake/stepmake/install-out.sub.make
+++ b/stepmake/stepmake/install-out.sub.make
@@ -1,4 +1,3 @@
-# install-out.sub.make
 
 include $(depth)/make/stepmake.make
 include $(stepdir)/install-out-targets.make
diff --git a/stepmake/stepmake/install-rules.make b/stepmake/stepmake/install-rules.make
index 841db19676..1bb8bf6d7f 100644
--- a/stepmake/stepmake/install-rules.make
+++ b/stepmake/stepmake/install-rules.make
@@ -1,2 +1 @@
-
-#empty
+# empty
diff --git a/stepmake/stepmake/install-targets.make b/stepmake/stepmake/install-targets.make
index d866ce7705..0eaa54f4a0 100644
--- a/stepmake/stepmake/install-targets.make
+++ b/stepmake/stepmake/install-targets.make
@@ -1,4 +1,3 @@
-# install-targets.make
 
 local-install: local-install-files local-install-outfiles
 
diff --git a/stepmake/stepmake/install-vars.make b/stepmake/stepmake/install-vars.make
index 841db19676..1bb8bf6d7f 100644
--- a/stepmake/stepmake/install-vars.make
+++ b/stepmake/stepmake/install-vars.make
@@ -1,2 +1 @@
-
-#empty
+# empty
diff --git a/stepmake/stepmake/install.sub.make b/stepmake/stepmake/install.sub.make
index 7a4dc59e2b..d986fe1970 100644
--- a/stepmake/stepmake/install.sub.make
+++ b/stepmake/stepmake/install.sub.make
@@ -1,4 +1,3 @@
-# install.sub.make
 
 include $(depth)/make/stepmake.make
 include $(stepdir)/install-targets.make
diff --git a/stepmake/stepmake/library-targets.make b/stepmake/stepmake/library-targets.make
index ad32b20874..7cb7ea5bfe 100644
--- a/stepmake/stepmake/library-targets.make
+++ b/stepmake/stepmake/library-targets.make
@@ -1,6 +1,3 @@
-# dependency list of library:
-#
-
 
 default: $(LIBRARY)
 
diff --git a/stepmake/stepmake/makedir-rules.make b/stepmake/stepmake/makedir-rules.make
index ea30561d83..1bb8bf6d7f 100644
--- a/stepmake/stepmake/makedir-rules.make
+++ b/stepmake/stepmake/makedir-rules.make
@@ -1 +1 @@
-#empty
+# empty
diff --git a/stepmake/stepmake/makedir-targets.make b/stepmake/stepmake/makedir-targets.make
index 341229447c..e175c3e807 100644
--- a/stepmake/stepmake/makedir-targets.make
+++ b/stepmake/stepmake/makedir-targets.make
@@ -1,5 +1,4 @@
 
-
 spec: $(OUTSPEC_FILES)
 
 $(OUTSPEC_FILES): $(depth)/VERSION 
diff --git a/stepmake/stepmake/makedir-vars.make b/stepmake/stepmake/makedir-vars.make
index 11387ce235..12176831ce 100644
--- a/stepmake/stepmake/makedir-vars.make
+++ b/stepmake/stepmake/makedir-vars.make
@@ -1,8 +1,4 @@
 
-
-# stepmake/makedir.shared.make
-# urg: stuff shared between yodl/lily/stepmake
-
 MAKE_FILES := $(wildcard *.make)
 LSM_FILES:= $(wildcard *.lsm.in)
 OUTLSM_FILES=$(addprefix $(outdir)/,$(basename $(LSM_FILES)))
diff --git a/stepmake/stepmake/metafont-targets.make b/stepmake/stepmake/metafont-targets.make
index 5dffa45820..eac21cf496 100644
--- a/stepmake/stepmake/metafont-targets.make
+++ b/stepmake/stepmake/metafont-targets.make
@@ -1,5 +1,4 @@
 
-
 tfm: $(TFM_FILES)
 
 dvi: $(DVI_FILES)
diff --git a/stepmake/stepmake/metapost-rules.make b/stepmake/stepmake/metapost-rules.make
index 6e135ede15..38a9322a04 100644
--- a/stepmake/stepmake/metapost-rules.make
+++ b/stepmake/stepmake/metapost-rules.make
@@ -1,4 +1,3 @@
-
 # Don't remove $(outdir)/.log's.  Logs are a target!
 
 $(outdir)/%.0: %.mf $(outdir)/mfplain.mem  
diff --git a/stepmake/stepmake/metapost-targets.make b/stepmake/stepmake/metapost-targets.make
index c90fd062bb..66d57a847d 100644
--- a/stepmake/stepmake/metapost-targets.make
+++ b/stepmake/stepmake/metapost-targets.make
@@ -1,3 +1,2 @@
 
-
 pfa: $(PFA_FILES) 
diff --git a/stepmake/stepmake/po-targets.make b/stepmake/stepmake/po-targets.make
index 796abf81f9..6e2b52317c 100644
--- a/stepmake/stepmake/po-targets.make
+++ b/stepmake/stepmake/po-targets.make
@@ -35,4 +35,4 @@ po-changes:
 	$(MAKE) -C $(po-dir) po-changes
 
 po-replace: po
-	$(MAKE) -C $(po-dir) po-replace
\ No newline at end of file
+	$(MAKE) -C $(po-dir) po-replace
diff --git a/stepmake/stepmake/pod-rules.make b/stepmake/stepmake/pod-rules.make
index 252a9d6227..e490e9424c 100644
--- a/stepmake/stepmake/pod-rules.make
+++ b/stepmake/stepmake/pod-rules.make
@@ -1,4 +1,3 @@
-# Pod_rules.make
 
 .SUFFIXES: .1 .5 .html .pod .txt
 
diff --git a/stepmake/stepmake/podir-targets.make b/stepmake/stepmake/podir-targets.make
index d64120b6dd..0b831c5c79 100644
--- a/stepmake/stepmake/podir-targets.make
+++ b/stepmake/stepmake/podir-targets.make
@@ -1,4 +1,3 @@
-# Porules.make
 
 .SUFFIXES: .po .pot .mo
 
diff --git a/stepmake/stepmake/scm-rules.make b/stepmake/stepmake/scm-rules.make
index 841db19676..1bb8bf6d7f 100644
--- a/stepmake/stepmake/scm-rules.make
+++ b/stepmake/stepmake/scm-rules.make
@@ -1,2 +1 @@
-
-#empty
+# empty
diff --git a/stepmake/stepmake/scm-targets.make b/stepmake/stepmake/scm-targets.make
index 841db19676..1bb8bf6d7f 100644
--- a/stepmake/stepmake/scm-targets.make
+++ b/stepmake/stepmake/scm-targets.make
@@ -1,2 +1 @@
-
-#empty
+# empty
diff --git a/stepmake/stepmake/script-vars.make b/stepmake/stepmake/script-vars.make
index 4f0c29d8d4..e325882478 100644
--- a/stepmake/stepmake/script-vars.make
+++ b/stepmake/stepmake/script-vars.make
@@ -1,5 +1,4 @@
 
-
 PERL_SCRIPTS_IN := $(wildcard *.pl)
 PERL_SCRIPTS = $(addprefix $(outdir)/, $(PERL_SCRIPTS_IN:.pl=))
 BASH_SCRIPTS_IN := $(wildcard *.bash)
diff --git a/stepmake/stepmake/substitute-vars.make b/stepmake/stepmake/substitute-vars.make
index cb23feff92..6166c8b5ac 100644
--- a/stepmake/stepmake/substitute-vars.make
+++ b/stepmake/stepmake/substitute-vars.make
@@ -1,4 +1,3 @@
-# Substitute.make
 
 sed-endline = sed 's!$$!\\!'
 sed-newline = sed 's!$$!\n!'
diff --git a/stepmake/stepmake/tex-targets.make b/stepmake/stepmake/tex-targets.make
index 215aa61471..1bb8bf6d7f 100644
--- a/stepmake/stepmake/tex-targets.make
+++ b/stepmake/stepmake/tex-targets.make
@@ -1,2 +1 @@
-
-# also empty
+# empty
diff --git a/stepmake/stepmake/tex-vars.make b/stepmake/stepmake/tex-vars.make
index 6d7b52cba4..6466cfdce5 100644
--- a/stepmake/stepmake/tex-vars.make
+++ b/stepmake/stepmake/tex-vars.make
@@ -1,3 +1,2 @@
-#empty
 
 export TEXPICTS:=$(outdir)$(PATHSEP)$(TEXPICTS)
diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make
index f010dda87b..663c89bcdb 100644
--- a/stepmake/stepmake/texinfo-rules.make
+++ b/stepmake/stepmake/texinfo-rules.make
@@ -1,4 +1,3 @@
-# Texinfo_rules.make
 
 .SUFFIXES: .html .info .texi .texinfo
 
diff --git a/stepmake/stepmake/topdocs-rules.make b/stepmake/stepmake/topdocs-rules.make
index 7a548bc2cf..1bb8bf6d7f 100644
--- a/stepmake/stepmake/topdocs-rules.make
+++ b/stepmake/stepmake/topdocs-rules.make
@@ -1 +1 @@
-#epmty
\ No newline at end of file
+# empty
diff --git a/stepmake/stepmake/toplevel-rules.make b/stepmake/stepmake/toplevel-rules.make
index ea30561d83..1bb8bf6d7f 100644
--- a/stepmake/stepmake/toplevel-rules.make
+++ b/stepmake/stepmake/toplevel-rules.make
@@ -1 +1 @@
-#empty
+# empty
diff --git a/stepmake/stepmake/toplevel-targets.make b/stepmake/stepmake/toplevel-targets.make
index a8e4dea6eb..4db0600eba 100644
--- a/stepmake/stepmake/toplevel-targets.make
+++ b/stepmake/stepmake/toplevel-targets.make
@@ -1,6 +1,3 @@
-# -*-Makefile-*-
-# title	   Toplevel_targets.make
-
 include $(stepdir)/www-targets.make
 
 local-dist: configure 
@@ -35,12 +32,6 @@ $(README_TXT_FILES): do-top-doc
 
 local-clean:
 
-###check-top-web:
-###	$(MAKE) -C Documentation/topdocs WWW
-#####
-
-####index.html: check-top-web NEWS
-
 local-dist: do-top-doc
 
 dist:
@@ -70,7 +61,7 @@ local-help:
   distclean   cleaner than clean (duh)\n\
   doc         update all documentation\n\
   release     roll tarball and generate patch\n\
-  rpm         build Red Hat package\n\
+  rpm         build rpm (Red Hat) package\n\
   po          make new translation Portable Object database\n\
   po-replace  do po-update and replace catalogs with msgmerged versions\n\
   po-update   update translation Portable Object database\n\
diff --git a/stepmake/stepmake/www-rules.make b/stepmake/stepmake/www-rules.make
index 5dd8fd0248..1bb8bf6d7f 100644
--- a/stepmake/stepmake/www-rules.make
+++ b/stepmake/stepmake/www-rules.make
@@ -1 +1 @@
-#empty
\ No newline at end of file
+# empty
diff --git a/stepmake/stepmake/www-vars.make b/stepmake/stepmake/www-vars.make
index 5dd8fd0248..1bb8bf6d7f 100644
--- a/stepmake/stepmake/www-vars.make
+++ b/stepmake/stepmake/www-vars.make
@@ -1 +1 @@
-#empty
\ No newline at end of file
+# empty