diff options
| author | bwarken <bwarken> | 2013-04-24 19:09:25 +0000 |
|---|---|---|
| committer | bwarken <bwarken> | 2013-04-24 19:09:25 +0000 |
| commit | 956bcb874c6e39eda977d6e42e4f882e0dcba8dc (patch) | |
| tree | 10c118ed3012b8351cdfca06b24dce18e0ccac3c /contrib | |
| parent | 3ca576f37dea40a61499e7a7beed1411219afe3b (diff) | |
| download | groff-956bcb874c6e39eda977d6e42e4f882e0dcba8dc.tar.gz | |
glilypond: remove Perl test.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/glilypond/ChangeLog | 4 | ||||
| -rw-r--r-- | contrib/glilypond/Makefile.sub | 53 |
2 files changed, 26 insertions, 31 deletions
diff --git a/contrib/glilypond/ChangeLog b/contrib/glilypond/ChangeLog index 50116cea..2c3906bf 100644 --- a/contrib/glilypond/ChangeLog +++ b/contrib/glilypond/ChangeLog @@ -1,3 +1,7 @@ +2013-04-24 Bernd Warken <groff-bernd.warken-72@web.de> + + * Makefile.sub: Remove Perl test. + 2013-04-12 Bernd Warken <groff-bernd.warken-72@web.de> * glilypond.pl: Fix END for early exit of `--version'. diff --git a/contrib/glilypond/Makefile.sub b/contrib/glilypond/Makefile.sub index d475b29e..32a5dfa0 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: 12 Apr 2013 +# Last update: 24 Apr 2013 # This file is part of `glilypond' which is part of `groff'. @@ -45,45 +45,36 @@ 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 -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."; \ - fi - + 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 $@ install_data: glilypond - -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir) - $(RM) $(DESTDIR)$(bindir)/glilypond - $(INSTALL_SCRIPT) glilypond $(DESTDIR)$(bindir)/glilypond + -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir); \ + $(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; - if test -f HAVE_PERL; then \ - for f in $(GLILYPOND_); do \ - $(INSTALL_SCRIPT) $(srcdir)/$$f \ - $(DESTDIR)$(glilypond_dir)/$$f; \ - done; \ - fi; + done; \ + for f in $(GLILYPOND_); do \ + $(INSTALL_SCRIPT) $(srcdir)/$$f \ + $(DESTDIR)$(glilypond_dir)/$$f; \ + done uninstall_sub: - $(RM) $(DESTDIR)$(bindir)/glilypond + $(RM) $(DESTDIR)$(bindir)/glilypond; \ for f in $(GLILYPOND_); do \ $(RM) $(DESTDIR)$(glilypond_dir)/$$f; \ - done; - test -d $(DESTDIR)$(libdir)/groff/glilypond && \ - rmdir $(DESTDIR)$(libdir)/groff/glilypond + done; \ + test -d $(DESTDIR)$(libdir)/groff/glilypond \ + && rmdir $(DESTDIR)$(libdir)/groff/glilypond ######################################################################## # Emacs settings |