diff options
| author | bwarken <bwarken> | 2013-04-12 21:07:39 +0000 |
|---|---|---|
| committer | bwarken <bwarken> | 2013-04-12 21:07:39 +0000 |
| commit | 5b3aa0fbccaec9f50f29b8bcf555ba4257f96e54 (patch) | |
| tree | d25fccd5a8462e5e6f16b777d840c2b6231becea /contrib | |
| parent | 167cce4507e108680c4d8b42d9b93534a04cfc5b (diff) | |
| download | groff-5b3aa0fbccaec9f50f29b8bcf555ba4257f96e54.tar.gz | |
Correct former entries of glilypond.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/glilypond/ChangeLog | 4 | ||||
| -rw-r--r-- | contrib/glilypond/Makefile.sub | 55 |
2 files changed, 32 insertions, 27 deletions
diff --git a/contrib/glilypond/ChangeLog b/contrib/glilypond/ChangeLog index d50c97c3..c3134288 100644 --- a/contrib/glilypond/ChangeLog +++ b/contrib/glilypond/ChangeLog @@ -1,5 +1,9 @@ 2013-04-11 Bernd Warken <groff-bernd.warken-72@web.de> + * Makefile.sub: Corrections for Emacs. + +2013-04-11 Bernd Warken <groff-bernd.warken-72@web.de> + * old groff_lilypond: There is now a free `git' package containing all old versions of the former name `groff_lilypond v0.*'. They work with `lilypond' parts in `roff' files, but were not diff --git a/contrib/glilypond/Makefile.sub b/contrib/glilypond/Makefile.sub index a2ab11ca..d475b29e 100644 --- a/contrib/glilypond/Makefile.sub +++ b/contrib/glilypond/Makefile.sub @@ -7,7 +7,7 @@ # Written by Werner Lemberg <wl@gnu.org> and # Bernd Warken <groff-bernd.warken-72@web.de>. -# Last update: 28 Mar 2013 +# Last update: 12 Apr 2013 # This file is part of `glilypond' which is part of `groff'. @@ -36,28 +36,28 @@ RM=rm -f all: glilypond GLILYPOND=$(srcdir)/glilypond.pl \ - $(srcdir)/subs.pl \ - $(srcdir)/oop_fh.pl \ - $(srcdir)/args.pl \ - $(srcdir)/perl_test.pl + $(srcdir)/subs.pl \ + $(srcdir)/oop_fh.pl \ + $(srcdir)/args.pl \ + $(srcdir)/perl_test.pl GLILYPOND_=`echo $(GLILYPOND) | sed 's|$(srcdir)/||g'` # TODO: Add perl check to configure script. glilypond: $(GLILYPOND) if perl $(srcdir)/perl_test.pl 2>&1 >/dev/null; then \ - : >HAVE_PERL; \ - echo "Perl version works for "$@"'."; \ - sed \ - -e "s|@g@|$(g)|g" \ - -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \ - -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \ - -e "s|@glilypond_dir@|$(DESTDIR)$(glilypond_dir)|g" \ - -e "s|@VERSION@|$(version)$(revision)|g" \ - $(srcdir)/glilypond.pl >$@; \ - chmod +x $@; \ + : >HAVE_PERL; \ + echo "Perl version works for "$@"'."; \ + sed -f "$(SH_DEPS_SED_SCRIPT)" \ + -e "s|@g@|$(g)|g" \ + -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \ + -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \ + -e "s|@glilypond_dir@|$(DESTDIR)$(glilypond_dir)|g" \ + -e "s|@VERSION@|$(version)$(revision)|g" \ + $(srcdir)/glilypond.pl >$@; \ + chmod +x $@; \ else \ - echo "This program "$@" needs a newer version of Perl."; \ + echo "This program "$@" needs a newer version of Perl."; \ fi @@ -66,23 +66,24 @@ install_data: glilypond $(RM) $(DESTDIR)$(bindir)/glilypond $(INSTALL_SCRIPT) glilypond $(DESTDIR)$(bindir)/glilypond -test -d $(DESTDIR)$(glilypond_dir) \ - || $(mkinstalldirs) $(DESTDIR)$(glilypond_dir) + || $(mkinstalldirs) $(DESTDIR)$(glilypond_dir) for f in $(GLILYPOND_); do \ - $(RM) $(DESTDIR)$(glilypond_dir)/$$f; \ - done + $(RM) $(DESTDIR)$(glilypond_dir)/$$f; \ + done; if test -f HAVE_PERL; then \ - for f in $(GLILYPOND_); do \ - $(INSTALL_SCRIPT) $(srcdir)/$$f \ - $(DESTDIR)$(glilypond_dir)/$$f; \ - done; \ - fi; + for f in $(GLILYPOND_); do \ + $(INSTALL_SCRIPT) $(srcdir)/$$f \ + $(DESTDIR)$(glilypond_dir)/$$f; \ + done; \ + fi; uninstall_sub: $(RM) $(DESTDIR)$(bindir)/glilypond for f in $(GLILYPOND_); do \ - $(RM) $(DESTDIR)$(glilypond_dir)/$$f; \ - done - -rmdir $(DESTDIR)$(libdir)/groff/glilypond + $(RM) $(DESTDIR)$(glilypond_dir)/$$f; \ + done; + test -d $(DESTDIR)$(libdir)/groff/glilypond && \ + rmdir $(DESTDIR)$(libdir)/groff/glilypond ######################################################################## # Emacs settings |