[Groff-commit] groff/contrib/glilypond ChangeLog Makefile.sub

[Bernd Warken]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Bernd Warken <bwarken>  13/04/24 19:09:25

Modified files:
        contrib/glilypond: ChangeLog Makefile.sub 

Log message:
        glilypond: remove Perl test.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/ChangeLog?cvsroot=groff&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/Makefile.sub?cvsroot=groff&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/contrib/glilypond/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- ChangeLog   12 Apr 2013 22:30:44 -0000      1.7
+++ ChangeLog   24 Apr 2013 19:09:25 -0000      1.8
@@ -1,3 +1,7 @@
+2013-04-24  Bernd Warken  <address@hidden>
+
+       * Makefile.sub: Remove Perl test.
+
 2013-04-12  Bernd Warken  <address@hidden>
 
        * glilypond.pl: Fix END for early exit of `--version'.

Index: Makefile.sub
===================================================================
RCS file: /cvsroot/groff/groff/contrib/glilypond/Makefile.sub,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- Makefile.sub        12 Apr 2013 21:07:39 -0000      1.2
+++ Makefile.sub        24 Apr 2013 19:09:25 -0000      1.3
@@ -7,7 +7,7 @@
 # Written by Werner Lemberg <address@hidden> and
 # Bernd Warken <address@hidden>.
 
-# Last update: 12 Apr 2013
+# Last update: 24 Apr 2013
 
 # This file is part of `glilypond' which is part of `groff'.
 
@@ -45,9 +45,6 @@
 
 # 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" \
@@ -55,35 +52,29 @@
                        -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
-
+       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 \
+       done; \
                for f in $(GLILYPOND_); do \
                        $(INSTALL_SCRIPT) $(srcdir)/$$f \
                        $(DESTDIR)$(glilypond_dir)/$$f; \
-               done; \
-       fi;
+       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