-docdir = os.path.join (env['srcdir'], 'Documentation')
-out = env['out']
-srcdir = env['srcdir']
-verbose = verbose_opt (env, ' --verbose')
-a = ('makeinfo -I%(reldir)s -I${SOURCE.dir}'\
- + ' --output=${TARGET.dir}'\
- + ' --css-include=%(docdir)s/texinfo.css'\
- + ' --html%(verbose)s'\
- + ' $SOURCE &&' \
- + ' makeinfo -I%(reldir)s -I${SOURCE.dir}' \
- + ' --output=$TARGET' \
- + ' --css-include=%(docdir)s/texinfo.css' \
- + ' --html --no-split --no-headers %(verbose)s' \
- + ' $SOURCE') % vars ()
-def url_fixup (target, source, env):
- file_subst (str (target[0]),
- '\.\./lilypond-internals', 'lilypond-internals/')
-c = 'pwd; ln -f %(userbuild)s/*.png %(userbuild)s/*.ly ${TARGET.dir}/' % vars ()
-e = env.Copy ()
-e.Command ('lilypond/lilypond.html', 'lilypond.texi', [a, url_fixup, c])
-e.Command ('lilypond-internals/lilypond-internals.html',
- 'lilypond-internals.texi', a)
-
-env.Alias ('doc', texis)
-env.Alias ('doc', dvis)
-env.Alias ('doc', pss)
-env.Alias ('doc', pdfs)
-
-env.Alias ('doc', 'lilypond-internals/lilypond.html')
-env.Alias ('doc', 'lilypond-internals/lilypond-internals.html')
-
-#testing
-all_sources = ['SConscript',] + sources + pngs
-x = env.Tar (env['tarball'], all_sources)
+e['usersrc'] = Dir ('.').srcnode ().abspath
+e['userout'] = Dir ('.').abspath
+
+a = ['$MAKEINFO -I$usersrc -I${SOURCE.dir} --html \
+ --css-include=$srcdir/Documentation/texinfo.css $__verbose \
+ --output=${TARGET.dir} $SOURCE',
+ 'ln -f ${SOURCE.dir}/*.png ${SOURCE.dir}/*.ly ${TARGET.dir}/',]
+
+e.Command ('lilypond/index.html', 'lilypond.texi', a)
+e.Command ('lilypond-internals/index.html', 'lilypond-internals.texi', a)
+e.Command ('music-glossary/index.html', 'music-glossary.texi', a)
+
+a = ['$MAKEINFO -I$usersrc -I${SOURCE.dir} --html \
+ --no-split --no-headers \
+ --css-include=$srcdir/Documentation/texinfo.css $__verbose \
+ --output=$TARGET $SOURCE']
+
+e.Command ('lilypond.html', 'lilypond.texi', a)
+e.Command ('lilypond-internals.html', 'lilypond-internals.texi', a)
+e.Command ('music-glossary.html', 'music-glossary.texi', a)
+
+#Hmm -- why not just mv ./Documentation/{*,*/*} ./doc :-)
+env.Alias ('doc', texi)
+env.Alias ('doc', dvi)
+env.Alias ('doc', ps)
+env.Alias ('doc', pdf)
+
+env.Alias ('doc', 'lilypond/index.html')
+env.Alias ('doc', 'lilypond-internals/index.html')
+env.Alias ('doc', 'lilypond.html')
+env.Alias ('doc', 'lilypond-internals.html')
+
+# install ('lilypond/*', env['sharedir_doc_package'] + '/html')
+# install ('lilypond-user/*', env['sharedir_doc_package'] + '/html')