+1.3.120.jcn1
+============
+
+* Bugfix Ly2dvi: reset LC_ALL and LC_LANG too.
+
+* Commented out dubious undocumented $(PATHSEP) from lilypond-vars.make
+
+* Replaced some instances of [$(outdir)/].. with $(pwd), these may
+break --srcdir builds and texi2dvi.
+
+* Several fixes for --srcdir build, allowing build from read only media.
+
+* Moved make/toplevel.make.in to less unusual GNUmakefile.in
+
1.3.120
=======
depth=../..
-
LATEX_FILES =$(wildcard *.latex)
--- /dev/null
+# -*-Makefile-*-
+# title specific top level makefile for LilyPond
+
+# subdir level:
+#
+depth = .
+#
+
+# descent order into subdirectories:
+#
+SUBDIRS = buildscripts scripts flower lily mf midi2ly po debian \
+ Documentation ly input tex make mutopia intl $(builddir)/stepmake\
+ ps scm
+#
+
+SCRIPTS = configure aclocal.m4
+README_FILES = DEDICATION COPYING NEWS CHANGES ROADMAP
+README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt FAQ.txt
+IN_FILES := $(wildcard *.in)
+EXTRA_DIST_FILES = lilypond-font-lock.el lilypond-mode.el vimrc VERSION $(README_FILES) $(SCRIPTS) $(IN_FILES)
+NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES)
+
+# bootstrap stepmake:
+#
+STEPMAKE_TEMPLATES=toplevel yolily-toplevel po
+include $(depth)/make/stepmake.make
+#
+
+website: fonts htmldoc examples footify
+
+footify:
+ $(footify) --index=./ `$(FIND) . -maxdepth 1 -name '*.html' -print`
+ $(footify-all-command)
+
+fonts:
+ $(MAKE) -C $(depth)/mf
+
+doc:
+ $(MAKE) -C Documentation
+
+htmldoc:
+ $(MAKE) out='www' local-WWW
+ $(MAKE) out='www' -C Documentation WWW
+ rm -f `find . -name \*.html~ -print`
+ $(footify) --index=./ `$(FIND) . -maxdepth 1 -name '*.html' -print`
+ $(footify-all-command)
+ find `find Documentation -type d -name 'out-www'` -not -name '*dvi' -not -name '*ly' -not -name '*tex' -not -name '*.ps' -not -name 'out-www' > wwwlist
+ tar cfz $(outdir)/htmldoc.tar.gz `cat wwwlist` `ls *.png $(ERRORLOG)` index.html
+
+examples:
+ $(MAKE) out='www' -C input WWW
+ $(MAKE) out='www' -C mutopia WWW
+# arg, should not break concept of recursive make;
+# this breaks links (and dependencies, see above)
+
+# don't understand this comment --hwn
+
+# See below. The footify-all you had before caused dead links on the
+# webpage, because the footify command assumes it can calculate the location
+# of index.html from the current depth. That doesn't work, if you don't
+# use recursive make like we do everywhere else; leads to bugs that you
+# make a specific fix for.
+
+ $(PYTHON) $(buildscript-dir)/mutopia-index.py -o short-examples.html input/
+ $(PYTHON) $(buildscript-dir)/mutopia-index.py -o long-examples.html mutopia/
+#$(footify-all-command)
+ $(footify) --index=./ `$(FIND) . -name '*.html' -print`
+ tar --exclude='*.dvi' --exclude='*.tex' --exclude='*.ps' --exclude='*.ppm' -czf $(outdir)/examples.tar.gz *-examples.html `find input mutopia -type d -name 'out-www' -print`
+
+# Kpathsea is overkill, and a horror/impossible to compile without compiling
+# and using a matching TeX (well, I gave up trying for now).
+my_tfm_path=$(TFM_PATH) /tmp /tmp /tmp /tmp /tmp /tmp
+
+localinstall:
+ mkdir -p $(datadir)
+ifeq ($(KPATHSEA),0)
+ $(foreach i, 1 2 3 4 5, rm -f $(datadir)/tfm.$(i); $(LN_S) $(word $(i), $(my_tfm_path)) $(datadir)/tfm.$(i) ; )
+endif
+
+local-WWW-clean:
+ $(SHELL) $(buildscript-dir)/clean-fonts.sh
+
MAJOR_VERSION=1
MINOR_VERSION=3
PATCH_LEVEL=120
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
# use the above to send patches: MY_PATCH_LEVEL is always empty for a
# released version.
-dnl WARNING WARNING WARNING WARNING
-dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
dnl aclocal.m4 -*-shell-script-*-
dnl StepMake subroutines for configure.in
+function base ()
+{
+ expr "$1" : "\(/[^/]*\)"
+}
+
+function unbase ()
+{
+ expr "$1" : "/[^/]*\(.*\)"
+}
+
+function walk ()
+{
+ from=`(cd "$1" && pwd)`
+ to=`pwd`
+ t=`base "$to"`
+ f=`base "$from"`
+ while [ -n "$t" -a "$t" = "$f" ]; do
+ to=`unbase "$to"`
+ from=`unbase "$from"`
+ t=`base "$to"`
+ f=`base "$from"`
+ done
+ echo ..$to
+}
+
AC_DEFUN(AC_STEPMAKE_BIBTEX2HTML, [
AC_CHECK_PROGS(BIBTEX2HTML, bibtex2html bib2html, error)
if test "$BIBTEX2HTML" = "bib2html"; then
AC_DEFUN(AC_STEPMAKE_END, [
AC_OUTPUT($CONFIGFILE.make:config.make.in)
- rm -f $srcdir/GNUmakefile
- cp $srcdir/make/toplevel.make.in $srcdir/GNUmakefile
- chmod 444 $srcdir/GNUmakefile
- if test "$builddir" != "."; then
+ # regular in-place build
+ # test for srcdir_build = yes ?
+ if test "$builddir" = "."; then
+ rm -f $srcdir/GNUmakefile
+ cp $srcdir/GNUmakefile.in $srcdir/GNUmakefile
+ chmod 444 $srcdir/GNUmakefile
+ else # --srcdir build
rm -f GNUmakefile
cp $srcdir/make/srcdir.make.in GNUmakefile
chmod 444 GNUmakefile
if test "x$PACKAGE" = "xSTEPMAKE"; then
AC_MSG_RESULT(Stepmake package!)
- #if test "x$builddir" != "x"; then
- # builddir="../$builddir"
- #else
- # builddir=..
- #fi
- if test "$srcdir" != "."; then
+ AC_MSG_CHECKING(builddir)
+ if test "$srcdir" = "."; then
+ builddir=.
+ else
absolute_builddir="`pwd`"
package_absolute_builddir="`dirname $absolute_builddir`"
package_srcdir="`dirname $srcdir`"
builddir="`dirname $package_srcdir`/`basename $package_absolute_builddir`/`basename $absolute_builddir`"
- else
- builddir=.
fi
+ AC_MSG_RESULT($builddir)
(cd stepmake 2>/dev/null || mkdir stepmake)
(cd stepmake; rm -f stepmake; ln -s ../$srcdir/stepmake .)
else
AC_MSG_RESULT($PACKAGE)
- if test "$srcdir" != "."; then
- absolute_builddir="`pwd`"
- builddir="`dirname $srcdir`/`basename $absolute_builddir`"
- else
+ AC_MSG_CHECKING(builddir)
+ 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
+ fi
+ AC_MSG_RESULT($builddir)
+ if expr "$srcdir" : '/' > /dev/null 2>&1; then
+ absolute_srcdir=yes
+ AC_STEPMAKE_WARN(Absolute --srcdir specified: $srcdir)
fi
AC_MSG_CHECKING(for stepmake)
if test -d $stepmake; then
AC_MSG_RESULT($stepmake)
else
- stepmake='$(depth)'/$srcdir/stepmake
+ if test "$absolute_srcdir" != "yes"; then
+ stepmake='$(depth)'/$srcdir/stepmake
+ else
+ stepmake=$srcdir/stepmake
+ fi
AC_MSG_RESULT($srcdir/stepmake ($datadir/stepmake not found))
fi
+
AC_CONFIG_AUX_DIR(\
$HOME/usr/local/share/stepmake/bin\
$HOME/usr/local/lib/stepmake/bin\
--- /dev/null
+#!@SHELL@
+# walk.sh
+# ugh
+# print reversed relative path to $1
+
+function base ()
+{
+ expr "$1" : "\(/[^/]*\)"
+}
+
+function unbase ()
+{
+ expr "$1" : "/[^/]*\(.*\)"
+}
+
+function walk ()
+{
+ from=`(cd "$1" && pwd)`
+ to=`pwd`
+ t=`base "$to"`
+ f=`base "$from"`
+ while [ -n "$t" -a "$t" = "$f" ]; do
+ to=`unbase "$to"`
+ from=`unbase "$from"`
+ t=`base "$to"`
+ f=`base "$from"`
+ done
+ i=`echo $from | sed -e 's/[^/]\+/../g'`
+ if expr "$from" : '/' > /dev/null 2>&1; then
+ c=..
+ fi
+ echo $c$i$to
+}
+
+walk $1
+
--- /dev/null
+% The volta texts should read: 1-4 and 5
+% Not 1 and 2
+% (see 1.2.17)
+
+%{
+Hi,
+ I want to write some music that has the structure:
+
+ Intro
+ \repeat 4 { Chorus [first-ending] verse }
+ fifth-ending final
+
+ The obvious:
+
+ \repeat 4 { Chorus \alternative{{first-ending}{}} verse}
+ \alternative{{}{fifth-ending}}
+ final
+
+ doesn't work.
+
+ And the (logically correct but ugly)
+
+ \repeat 4 {Chorus}
+ \alternative {{first-ending verse}{fifth ending}}
+ final
+
+ is very ugly, because the volta bracket keeps going for so
+ long.
+
+ Peter C
+%}
+
+\score{
+ <
+ \context Staff \notes\relative c''{
+ c c c c
+ % coda-klugde: let volta span only one bar
+ \property Staff.voltaSpannerDuration = #(make-moment 1 1)
+ \repeat "volta" 5 { d d d d }
+ \alternative { { e e e e f f f f }
+ { g g g g } }
+ }
+ \context Lyrics \lyrics{
+ intro1
+ \repeat fold 5 {}
+ \alternative {
+ { chorus1 one verse1 }
+ { chorus1 two verse1 }
+ { chorus1 three verse }
+ { chorus1 four verse }
+ }
+ five1
+ }
+ >
+}
+
+
+%\version "1.0.16";
+% The volta texts should read: 1-4 and 5
+% Not 1 and 2
+% (see 1.2.17)
+
%{
Hi,
I want to write some music that has the structure:
export PATH:=$(topdir)/lily/out:$(topdir)/buildscripts/out:$(PATH)
+
+# Huh, PATHSEP, but still '/' for dirsep?
+# Doesn't make sense.
+ifeq (0,1)
+
export MFINPUTS:=$(topdir)/mf/$(PATHSEP)$(MFINPUTS)$(PATHSEP)$(PATHSEP)
-export TEXINPUTS:=$(topdir)/mf/out/$(PATHSEP)$(topdir)/tex/$(PATHSEP)$(topdir)/ps/$(PATHSEP)$(TEXINPUTS)$(PATHSEP)..$(PATHSEP)$(PATHSEP)
+export TEXINPUTS:=$(topdir)/mf/out/$(PATHSEP)$(topdir)/tex/$(PATHSEP)$(topdir)/ps/$(PATHSEP)$(TEXINPUTS)$(PATHSEP)$(pwd)$(PATHSEP)$(PATHSEP)
export LILYINCLUDE:=$(topdir)/ps$(PATHSEP)$(topdir)/scm$(PATHSEP)$(topdir)/ly$(PATHSEP)$(topdir)/mf/out$(PATHSEP)$(PATHSEP)$(TEX_TFMDIR)$(PATHSEP)$(LILYINCLUDE)
+else
+
+export MFINPUTS:=$(topdir)/mf/:$(MFINPUTS)::
+export TEXINPUTS:=$(topdir)/mf/out/:$(topdir)/tex/:$(topdir)/ps/:$(TEXINPUTS):$(pwd)::
+export LILYINCLUDE:=$(topdir)/ps:$(topdir)/scm:$(topdir)/ly:$(topdir)/mf/out::$(TEX_TFMDIR):$(LILYINCLUDE)
+
+endif
export LILYPONDPREFIX:=$(depth)/
$(outdir)/%.latex: %.doc
rm -f $@
- LILYPONDPREFIX=$(LILYPONDPREFIX)/.. $(PYTHON) $(script-dir)/lilypond-book.py --outdir=$(outdir) -I .. -I $(input-dir)/test/ --dependencies --dep-prefix=$(outdir)/ $<
+ LILYPONDPREFIX=$(LILYPONDPREFIX)/.. $(PYTHON) $(script-dir)/lilypond-book.py --outdir=$(outdir) -I $(pwd) -I $(input-dir)/test/ --dependencies --dep-prefix=$(outdir)/ $<
chmod -w $@
# don't do ``cd $(outdir)'', and assume that $(outdir)/.. is the src dir.
# it is not, for --scrdir builds
$(outdir)/%.texi: %.tely
rm -f $@
- LILYPONDPREFIX=$(LILYPONDPREFIX)/.. $(PYTHON) $(script-dir)/lilypond-book.py --outdir=$(outdir) -I .. -I $(input-dir)/test/ --dependencies --format=texi $<
+ LILYPONDPREFIX=$(LILYPONDPREFIX)/.. $(PYTHON) $(script-dir)/lilypond-book.py --outdir=$(outdir) -I $(pwd) -I $(input-dir)/test/ --dependencies --format=texi $<
chmod -w $@
# nexi: no-lily texi
# for plain info doco: don't run lily
$(outdir)/%.nexi: %.tely
rm -f $@
- LILYPONDPREFIX=$(LILYPONDPREFIX)/.. $(PYTHON) $(script-dir)/lilypond-book.py --outdir=$(outdir) --no-lily -I .. -I $(input-dir)/test/ --dependencies --dep-prefix=$(outdir)/ --format=texi $<
+ LILYPONDPREFIX=$(LILYPONDPREFIX)/.. $(PYTHON) $(script-dir)/lilypond-book.py --outdir=$(outdir) --no-lily -I $(pwd) -I $(input-dir)/test/ --dependencies --dep-prefix=$(outdir)/ --format=texi $<
mv $(@D)/$(*F).texi $@
chmod -w $@
include $(config)
-SRCDIR=$(MAKE) -C $(srcdir) builddir=$(builddir) $@
+SRCDIR=$(MAKE) -C $(srcdir) -f GNUmakefile.in builddir=$(builddir) $@
default: all
include $(configuration)
ifeq ($(builddir),.)
- outroot=.
+ outroot=$(builddir)
else
outroot=$(depth)/$(builddir)/$(patsubst $(shell cd $(depth); pwd)%,%,$(shell cd .; pwd))
endif
-# -*-Makefile-*-
-# title specific top level makefile for LilyPond
-
-# subdir level:
-#
-depth = .
-#
-
-# descent order into subdirectories:
-#
-SUBDIRS = buildscripts scripts flower lily mf midi2ly po debian \
- Documentation ly input tex make mutopia intl $(builddir)/stepmake\
- ps scm
-#
-
-SCRIPTS = configure aclocal.m4
-README_FILES = DEDICATION COPYING NEWS CHANGES ROADMAP
-README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt FAQ.txt
-IN_FILES := $(wildcard *.in)
-EXTRA_DIST_FILES = lilypond-font-lock.el lilypond-mode.el vimrc VERSION $(README_FILES) $(SCRIPTS) $(IN_FILES)
-NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES)
-
-# bootstrap stepmake:
-#
-STEPMAKE_TEMPLATES=toplevel yolily-toplevel po
-include $(depth)/make/stepmake.make
-#
-
-website: fonts htmldoc examples footify
-
-footify:
- $(footify) --index=./ `$(FIND) . -maxdepth 1 -name '*.html' -print`
- $(footify-all-command)
-
-fonts:
- $(MAKE) -C $(depth)/mf
-
-doc:
- $(MAKE) -C Documentation
-
-htmldoc:
- $(MAKE) out='www' local-WWW
- $(MAKE) out='www' -C Documentation WWW
- rm -f `find . -name \*.html~ -print`
- $(footify) --index=./ `$(FIND) . -maxdepth 1 -name '*.html' -print`
- $(footify-all-command)
- find `find Documentation -type d -name 'out-www'` -not -name '*dvi' -not -name '*ly' -not -name '*tex' -not -name '*.ps' -not -name 'out-www' > wwwlist
- tar cfz $(outdir)/htmldoc.tar.gz `cat wwwlist` `ls *.png $(ERRORLOG)` index.html
-
-examples:
- $(MAKE) out='www' -C input WWW
- $(MAKE) out='www' -C mutopia WWW
-# arg, should not break concept of recursive make;
-# this breaks links (and dependencies, see above)
-
-# don't understand this comment --hwn
-
-# See below. The footify-all you had before caused dead links on the
-# webpage, because the footify command assumes it can calculate the location
-# of index.html from the current depth. That doesn't work, if you don't
-# use recursive make like we do everywhere else; leads to bugs that you
-# make a specific fix for.
-
- $(PYTHON) $(buildscript-dir)/mutopia-index.py -o short-examples.html input/
- $(PYTHON) $(buildscript-dir)/mutopia-index.py -o long-examples.html mutopia/
-#$(footify-all-command)
- $(footify) --index=./ `$(FIND) . -name '*.html' -print`
- tar --exclude='*.dvi' --exclude='*.tex' --exclude='*.ps' --exclude='*.ppm' -czf $(outdir)/examples.tar.gz *-examples.html `find input mutopia -type d -name 'out-www' -print`
-
-# Kpathsea is overkill, and a horror/impossible to compile without compiling
-# and using a matching TeX (well, I gave up trying for now).
-my_tfm_path=$(TFM_PATH) /tmp /tmp /tmp /tmp /tmp /tmp
-
-localinstall:
- mkdir -p $(datadir)
-ifeq ($(KPATHSEA),0)
- $(foreach i, 1 2 3 4 5, rm -f $(datadir)/tfm.$(i); $(LN_S) $(word $(i), $(my_tfm_path)) $(datadir)/tfm.$(i) ; )
-endif
-
-local-WWW-clean:
- $(SHELL) $(buildscript-dir)/clean-fonts.sh
-
import glob
import tempfile
-os.environ['LANG'] = '' # Can't grep localized msgs
+# Can't grep localized msgs
+os.environ['LC_ALL'] = ''
+os.environ['LANG'] = ''
+os.environ['LC_LANG'] = ''
--- /dev/null
+# -*-Makefile-*-
+# title specific top level makefile for StepMake
+
+# subdir level:
+#
+depth = .
+#
+
+# descent order into subdirectories:
+#
+ifeq ($(PACKAGE),STEPMAKE)
+SUBDIRS = bin make stepmake
+else
+SUBDIRS =
+endif
+#
+
+# list of distribution files:
+#
+SCRIPTS = configure aclocal.m4
+README_FILES = CHANGES README TODO
+README_TXT_FILES = AUTHORS.txt INSTALL.txt
+EXTRA_DIST_FILES = $(IN_FILES) VERSION $(README_FILES) $(SCRIPTS) INSTALL.texi
+NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES)
+#
+
+# bootstrap stepmake:
+#
+STEPMAKE_TEMPLATES=toplevel texinfo
+include $(depth)/make/stepmake.make
+#
+
+# descent order into subdirectories:
+#
+ifeq ($(PACKAGE),STEPMAKE)
+SUBDIRS = bin make stepmake
+else
+SUBDIRS =
+endif
+#
+
+#urg urg
+stepmake/aclocal.m4:
+ -$(LN) aclocal.m4 $@
+
+ifeq ($(PACKAGE),STEPMAKE)
+INSTALLATION_DIR=$(datadir)
+INSTALLATION_FILES=$(DIST_FILES) $(NON_ESSENTIAL_DIST_FILES) GNUmakefile config.make config.status
+include $(stepdir)/install-targets.make
+endif
+
+localclean:
+ rm -f bin/*.pyc
+ rm -f stepmake/stepmake stepmake/bin stepmake/aclocal.m4
dnl aclocal.m4 -*-shell-script-*-
dnl StepMake subroutines for configure.in
+function base ()
+{
+ expr "$1" : "\(/[^/]*\)"
+}
+
+function unbase ()
+{
+ expr "$1" : "/[^/]*\(.*\)"
+}
+
+function walk ()
+{
+ from=`(cd "$1" && pwd)`
+ to=`pwd`
+ t=`base "$to"`
+ f=`base "$from"`
+ while [ -n "$t" -a "$t" = "$f" ]; do
+ to=`unbase "$to"`
+ from=`unbase "$from"`
+ t=`base "$to"`
+ f=`base "$from"`
+ done
+ echo ..$to
+}
+
AC_DEFUN(AC_STEPMAKE_BIBTEX2HTML, [
AC_CHECK_PROGS(BIBTEX2HTML, bibtex2html bib2html, error)
if test "$BIBTEX2HTML" = "bib2html"; then
AC_DEFUN(AC_STEPMAKE_END, [
AC_OUTPUT($CONFIGFILE.make:config.make.in)
- rm -f $srcdir/GNUmakefile
- cp $srcdir/make/toplevel.make.in $srcdir/GNUmakefile
- chmod 444 $srcdir/GNUmakefile
- if test "$builddir" != "."; then
+ # regular in-place build
+ # test for srcdir_build = yes ?
+ if test "$builddir" = "."; then
+ rm -f $srcdir/GNUmakefile
+ cp $srcdir/GNUmakefile.in $srcdir/GNUmakefile
+ chmod 444 $srcdir/GNUmakefile
+ else # --srcdir build
rm -f GNUmakefile
cp $srcdir/make/srcdir.make.in GNUmakefile
chmod 444 GNUmakefile
if test "x$PACKAGE" = "xSTEPMAKE"; then
AC_MSG_RESULT(Stepmake package!)
- #if test "x$builddir" != "x"; then
- # builddir="../$builddir"
- #else
- # builddir=..
- #fi
- if test "$srcdir" != "."; then
+ AC_MSG_CHECKING(builddir)
+ if test "$srcdir" = "."; then
+ builddir=.
+ else
absolute_builddir="`pwd`"
package_absolute_builddir="`dirname $absolute_builddir`"
package_srcdir="`dirname $srcdir`"
builddir="`dirname $package_srcdir`/`basename $package_absolute_builddir`/`basename $absolute_builddir`"
- else
- builddir=.
fi
+ AC_MSG_RESULT($builddir)
(cd stepmake 2>/dev/null || mkdir stepmake)
(cd stepmake; rm -f stepmake; ln -s ../$srcdir/stepmake .)
else
AC_MSG_RESULT($PACKAGE)
- if test "$srcdir" != "."; then
- absolute_builddir="`pwd`"
- builddir="`dirname $srcdir`/`basename $absolute_builddir`"
- else
+ AC_MSG_CHECKING(builddir)
+ 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
+ fi
+ AC_MSG_RESULT($builddir)
+ if expr "$srcdir" : '/' > /dev/null 2>&1; then
+ absolute_srcdir=yes
+ AC_STEPMAKE_WARN(Absolute --srcdir specified: $srcdir)
fi
AC_MSG_CHECKING(for stepmake)
if test -d $stepmake; then
AC_MSG_RESULT($stepmake)
else
- stepmake='$(depth)'/$srcdir/stepmake
+ if test "$absolute_srcdir" != "yes"; then
+ stepmake='$(depth)'/$srcdir/stepmake
+ else
+ stepmake=$srcdir/stepmake
+ fi
AC_MSG_RESULT($srcdir/stepmake ($datadir/stepmake not found))
fi
+
AC_CONFIG_AUX_DIR(\
$HOME/usr/local/share/stepmake/bin\
$HOME/usr/local/lib/stepmake/bin\
include $(config)
-SRCDIR=$(MAKE) -C $(srcdir) builddir=$(builddir) $@
+SRCDIR=$(MAKE) -C $(srcdir) -f GNUmakefile.in builddir=$(builddir) $@
default: all
configuration=$(depth)/config$(CONFIGSUFFIX).make
else
# user package
- # configuration=$(depth)/$(builddir)/config$(CONFIGSUFFIX).make
+ configuration=$(depth)/$(builddir)/config$(CONFIGSUFFIX).make
# stepmake package
configuration=$(depth)/../$(builddir)/stepmake/config$(CONFIGSUFFIX).make
endif
include $(configuration)
ifeq ($(builddir),.)
- outroot=.
+ outroot=$(builddir)
else
outroot=$(depth)/$(builddir)/$(patsubst $(shell cd $(depth); pwd)%,%,$(shell cd .; pwd))
endif
-# -*-Makefile-*-
-# title specific top level makefile for StepMake
-
-# subdir level:
-#
-depth = .
-#
-
-# descent order into subdirectories:
-#
-ifeq ($(PACKAGE),STEPMAKE)
-SUBDIRS = bin make stepmake
-else
-SUBDIRS =
-endif
-#
-
-# list of distribution files:
-#
-SCRIPTS = configure aclocal.m4
-README_FILES = CHANGES README TODO
-README_TXT_FILES = AUTHORS.txt INSTALL.txt
-EXTRA_DIST_FILES = $(IN_FILES) VERSION $(README_FILES) $(SCRIPTS) INSTALL.texi
-NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES)
-#
-
-# bootstrap stepmake:
-#
-STEPMAKE_TEMPLATES=toplevel texinfo
-include $(depth)/make/stepmake.make
-#
-
-# descent order into subdirectories:
-#
-ifeq ($(PACKAGE),STEPMAKE)
-SUBDIRS = bin make stepmake
-else
-SUBDIRS =
-endif
-#
-
-#urg urg
-stepmake/aclocal.m4:
- -$(LN) aclocal.m4 $@
-
-ifeq ($(PACKAGE),STEPMAKE)
-INSTALLATION_DIR=$(datadir)
-INSTALLATION_FILES=$(DIST_FILES) $(NON_ESSENTIAL_DIST_FILES) GNUmakefile config.make config.status
-include $(stepdir)/install-targets.make
-endif
-
-localclean:
- rm -f bin/*.pyc
- rm -f stepmake/stepmake stepmake/bin stepmake/aclocal.m4
$(deep-footify) $(sort $(wildcard $(outdir)/$(*F)/*.html))
$(outdir)/%.dvi: $(outdir)/%.texi
-# ugh, --clean removes .. from TEXINPUTS?
-# cd $(outdir); texi2dvi --batch --clean ../$<
- cd $(outdir); texi2dvi --batch ../$<
+ cd $(outdir); texi2dvi --batch $(<F)
$(outdir)/%.txt: $(outdir)/%.texi
- $(MAKEINFO) --force -I../ -I $(outdir) --no-split --no-headers --output $@ $<
+ $(MAKEINFO) --force -I $(pwd) -I $(outdir) --no-split --no-headers --output $@ $<
$(outdir)/%.texi: %.texi
rm -f $@
local-maintainerclean:
rm -f configure
-GNUmakefile: make/toplevel.make.in
+GNUmakefile: GNUmakefile.in
$(MAKE) INFILE=$< OUTFILE=$@ -f $(stepdir)/automatically-generated.sub.make
ifneq ($(PACKAGE),STEPMAKE)
projects / lilypond.git / commitdiff