diff options
| -rw-r--r-- | ChangeLog | 23 | ||||
| -rw-r--r-- | INSTALL.CVS (renamed from INSTALL.autotools) | 0 | ||||
| -rw-r--r-- | INSTALL.gen | 18 | ||||
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rw-r--r-- | Makefile.sub | 1 | ||||
| -rw-r--r-- | aclocal.m4 | 68 | ||||
| -rw-r--r-- | contrib/glilypond/subs.pl | 8 | ||||
| -rw-r--r-- | m4/ax_prog_perl_version.m4 | 66 | ||||
| -rw-r--r-- | m4/groff.m4 | 1 | ||||
| -rw-r--r-- | src/roff/grog/Makefile.sub | 90 |
10 files changed, 152 insertions, 124 deletions
@@ -1,5 +1,28 @@ 2013-04-16 Bernd Warken <groff-bernd.warken-72@web.de> + * INSTALL.gen: Replace this file by the daily `git' version of + `automake' `INSTALL' file. + + * INSTALL.autotools: Remove file. + + * INSTALL.CVS: New file, moved from `INSTALL.autotools'. + + * m4/ax_prog_perl_version.m4: New file, taken from package + `autoconf-archive-2013.04.06'. + + * m4/groff.m4: Remove unnecessary blank line. + + * Makefile.in: Add `$(PERLVERSION)'. + + * aclocal.m4: Run `autoreconf -I m4' (this includes + `aclocal -I m4'). This creates a suitable `aclocal.m4'. Remove + generated subdirectory `autom4te.cache'. + + * src/roff/grog/Makefile.sub: Correct `sed' command. Use `tabs' + that are needed by `GNU make'. + +2013-04-16 Bernd Warken <groff-bernd.warken-72@web.de> + * Makefile.sub: Add `m4/ax_compare_version.m4'. * aclocal.m4: Run the latest `aclocal -I m4' which generates a diff --git a/INSTALL.autotools b/INSTALL.CVS index 17b93a39..17b93a39 100644 --- a/INSTALL.autotools +++ b/INSTALL.CVS diff --git a/INSTALL.gen b/INSTALL.gen index 096fb77c..3aa9e1ba 100644 --- a/INSTALL.gen +++ b/INSTALL.gen @@ -1,10 +1,10 @@ +This file comes from GNU automake, it shouldn't be changed. + Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2013 - Free Software Foundation, Inc. - -Last Update: 15 Apr 2013 +Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, +Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -46,13 +46,9 @@ some point `config.cache' contains results you don't want to keep, you may remove or edit it. The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' -if you want to change it or regenerate `configure' using a newer -version of `autoconf'. - - You can also use `autoreconf -I m4' which does the same as `autoconf' -together with some other internal things. For more information about the usage of `GNU autotools', see the file `IKNSTALL.autotools'. - +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. The simplest way to compile this package is: diff --git a/Makefile.in b/Makefile.in index e56a92da..9c68f801 100644 --- a/Makefile.in +++ b/Makefile.in @@ -484,6 +484,7 @@ MDEFINES=\ "OTHERDEVDIRS=$(OTHERDEVDIRS)" \ "PAGE=$(PAGE)" \ "PERL=$(PERL)" \ + "PERLVERSION=$(PERLVERSION)" \ "GHOSTSCRIPT=$(GHOSTSCRIPT)" \ "PSPRINT=$(PSPRINT)" \ "PURIFY=$(PURIFY)" \ diff --git a/Makefile.sub b/Makefile.sub index f00ee31f..cb6df432 100644 --- a/Makefile.sub +++ b/Makefile.sub @@ -38,6 +38,7 @@ MOSTLYCLEANADD=\ M4MACROS=\ $(srcdir)/m4/ax_compare_version.m4 \ + $(srcdir)/m4/ax_prog_perl_version.m4 \ $(srcdir)/m4/codeset.m4 \ $(srcdir)/m4/fcntl-o.m4 \ $(srcdir)/m4/glibc21.m4 \ @@ -12,74 +12,8 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_prog_perl_version.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_PROG_PERL_VERSION([VERSION],[ACTION-IF-TRUE],[ACTION-IF-FALSE]) -# -# DESCRIPTION -# -# Makes sure that perl supports the version indicated. If true the shell -# commands in ACTION-IF-TRUE are executed. If not the shell commands in -# ACTION-IF-FALSE are run. Note if $PERL is not set (for example by -# running AC_CHECK_PROG or AC_PATH_PROG) the macro will fail. -# -# Example: -# -# AC_PATH_PROG([PERL],[perl]) -# AX_PROG_PERL_VERSION([5.8.0],[ ... ],[ ... ]) -# -# This will check to make sure that the perl you have supports at least -# version 5.8.0. -# -# NOTE: This macro uses the $PERL variable to perform the check. -# AX_WITH_PERL can be used to set that variable prior to running this -# macro. The $PERL_VERSION variable will be valorized with the detected -# version. -# -# LICENSE -# -# Copyright (c) 2009 Francesco Salvestrini <salvestrini@users.sourceforge.net> -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 11 - -AC_DEFUN([AX_PROG_PERL_VERSION],[ - AC_REQUIRE([AC_PROG_SED]) - AC_REQUIRE([AC_PROG_GREP]) - - AS_IF([test -n "$PERL"],[ - ax_perl_version="$1" - - AC_MSG_CHECKING([for perl version]) - changequote(<<,>>) - perl_version=`$PERL --version 2>&1 | $GREP "This is perl" | $SED -e 's/.* v\([0-9]*\.[0-9]*\.[0-9]*\) .*/\1/'` - changequote([,]) - AC_MSG_RESULT($perl_version) - - AC_SUBST([PERL_VERSION],[$perl_version]) - - AX_COMPARE_VERSION([$ax_perl_version],[le],[$perl_version],[ - : - $2 - ],[ - : - $3 - ]) - ],[ - AC_MSG_WARN([could not find the perl interpreter]) - $3 - ]) -]) - m4_include([m4/ax_compare_version.m4]) +m4_include([m4/ax_prog_perl_version.m4]) m4_include([m4/codeset.m4]) m4_include([m4/fcntl-o.m4]) m4_include([m4/glibc21.m4]) diff --git a/contrib/glilypond/subs.pl b/contrib/glilypond/subs.pl index c927ae3e..d193534c 100644 --- a/contrib/glilypond/subs.pl +++ b/contrib/glilypond/subs.pl @@ -427,7 +427,7 @@ sub usage { # for `--help' my $p = $Globals->{'prog'}; my $usage = EMPTYSTRING; - $usage = '###### usage:' . "\n" if ( $Args -> { 'verbose' } ); + $usage = '###### usage:' . "\n" if ( $Args->{'verbose'} ); $usage .= qq*Options for $p: Read a `roff' file or standard input and transform `lilypond' parts (everything between `.lilypond start' and `.lilypond end') into @@ -470,7 +470,7 @@ The directories set are created when they do not exist. my $pv = &perl_version(); $usage .= "\n" . 'Perl version ' . $pv . ' needed.' if ( $pv ); - $main::stdout -> print( $usage ); + $main::stdout->print( $usage ); } # end sub usage() @@ -486,8 +486,8 @@ sub version { # for `--version' my $output = EMPTYSTRING; $output = "###### version:\n" if ( $Args -> { 'verbose' } ); $output .= "`" . $Globals -> { 'prog' } . "' version `" . - $Legalese -> { 'version' } . "' of `" . - $Legalese -> { 'last_update' } . "' is part of `GNU groff'" . $end; + $Legalese->{'version'} . "' of `" . + $Legalese->{'last_update'} . "' is part of `GNU groff'" . $end; $stdout -> print( $output ); } # end sub version() diff --git a/m4/ax_prog_perl_version.m4 b/m4/ax_prog_perl_version.m4 new file mode 100644 index 00000000..18d9f745 --- /dev/null +++ b/m4/ax_prog_perl_version.m4 @@ -0,0 +1,66 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_prog_perl_version.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_PERL_VERSION([VERSION],[ACTION-IF-TRUE],[ACTION-IF-FALSE]) +# +# DESCRIPTION +# +# Makes sure that perl supports the version indicated. If true the shell +# commands in ACTION-IF-TRUE are executed. If not the shell commands in +# ACTION-IF-FALSE are run. Note if $PERL is not set (for example by +# running AC_CHECK_PROG or AC_PATH_PROG) the macro will fail. +# +# Example: +# +# AC_PATH_PROG([PERL],[perl]) +# AX_PROG_PERL_VERSION([5.8.0],[ ... ],[ ... ]) +# +# This will check to make sure that the perl you have supports at least +# version 5.8.0. +# +# NOTE: This macro uses the $PERL variable to perform the check. +# AX_WITH_PERL can be used to set that variable prior to running this +# macro. The $PERL_VERSION variable will be valorized with the detected +# version. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini <salvestrini@users.sourceforge.net> +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 11 + +AC_DEFUN([AX_PROG_PERL_VERSION],[ + AC_REQUIRE([AC_PROG_SED]) + AC_REQUIRE([AC_PROG_GREP]) + + AS_IF([test -n "$PERL"],[ + ax_perl_version="$1" + + AC_MSG_CHECKING([for perl version]) + changequote(<<,>>) + perl_version=`$PERL --version 2>&1 | $GREP "This is perl" | $SED -e 's/.* v\([0-9]*\.[0-9]*\.[0-9]*\) .*/\1/'` + changequote([,]) + AC_MSG_RESULT($perl_version) + + AC_SUBST([PERL_VERSION],[$perl_version]) + + AX_COMPARE_VERSION([$ax_perl_version],[le],[$perl_version],[ + : + $2 + ],[ + : + $3 + ]) + ],[ + AC_MSG_WARN([could not find the perl interpreter]) + $3 + ]) +]) diff --git a/m4/groff.m4 b/m4/groff.m4 index 69175370..d93fe51e 100644 --- a/m4/groff.m4 +++ b/m4/groff.m4 @@ -148,7 +148,6 @@ AC_DEFUN([GROFF_HTML_PROGRAMS], AC_MSG_WARN([missing program$plural: The program$plural - $missing cannot be found in the PATH. Consequently, groff's HTML backend (grohtml) will not work properly; diff --git a/src/roff/grog/Makefile.sub b/src/roff/grog/Makefile.sub index ff1e4800..16b1ae85 100644 --- a/src/roff/grog/Makefile.sub +++ b/src/roff/grog/Makefile.sub @@ -2,9 +2,10 @@ # File position: <groff-source>/src/roff/grog/Makefile.sub -# Copyright (C) 1993, 2006, 2009, 2013 Free Software Foundation, Inc. +# Copyright (C) 1993, 2006, 2009, 2013 +# Free Software Foundation, Inc. -# Last update: 12 Apr 2013 +# Last update: 16 Apr 2013 # This file is part of `grog' which is part of `groff'. @@ -24,57 +25,64 @@ ######################################################################## MAN1=grog.n -MOSTLYCLEANADD=grog $(MAN1) HAVE_PERL +MOSTLYCLEANADD=grog $(MAN1) # not all make programs have $(RM) predefined. RM=rm -f all: grog $(MAN1) -GROG=$(srcdir)/perl_test.pl - +# lib .pl-files +#GROG=$(srcdir)/subs.pl +GROG= GROG_=`echo $(GROG) | sed 's|$(srcdir)/||g'` -grog: grog.pl $(SH_DEPS_SED_SCRIPT) - -$(RM) -f $@; - 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|@EGREP@|$(EGREP)|g" \ - -e "s|@VERSION@|$(version)$(revision)|" \ - -e "$(SH_SCRIPT_SED_CMD)" \ - $(srcdir)/grog.pl >$@; \ - chmod +x $@; \ - else \ - echo "This program "$@" needs a newer version of Perl."; \ - exit 1; \ - fi; -install_data: grog - -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir); - $(RM) $(DESTDIR)$(bindir)/grog; - $(INSTALL_SCRIPT) grog $(DESTDIR)$(bindir)/grog; - -test -d $(DESTDIR)$(grog_dir) \ - || $(mkinstalldirs) $(DESTDIR)$(grog_dir); - for f in $(GROG_); do \ - $(RM) $(DESTDIR)$(grog_dir)/$$f; \ - done - if test -f HAVE_PERL; then \ - for f in $(GROG_); do \ - $(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(grog_dir)/$$f; \ - done; \ - fi; +# Perl version works for all parts of `groff'. +grog: grog.pl $(GROG) $(SH_DEPS_SED_SCRIPT) + -$(RM) "$@"; + sed -f "$(SH_DEPS_SED_SCRIPT)" \ + -e "1s|^\(#! \).*perl|\\1$(PERL)|" \ + -e "s|@g@|$(g)|g" \ + -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \ + -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \ + -e "s|@EGREP@|$(EGREP)|g" \ + -e "s|@VERSION@|$(version)$(revision)|" \ + -e "$(SH_SCRIPT_SED_CMD)" \ + $(srcdir)/grog.pl >$@; + chmod +x $@; +.PHONY: install_data +install_data: grog + -test -d "$(DESTDIR)$(bindir)" || \ + $(mkinstalldirs) "$(DESTDIR)$(bindir)"; + -$(RM) "$(DESTDIR)$(bindir)/grog"; + $(INSTALL_SCRIPT) grog "$(DESTDIR)$(bindir)/grog"; + -test -d $(DESTDIR)$(grog_dir) || \ + $(mkinstalldirs) "$(DESTDIR)$(grog_dir)"; + -$(RM) "$(DESTDIR)$(grog_dir)/grog"; + $(INSTALL_SCRIPT) "$(srcdir)/grog" "$(DESTDIR)$(grog_dir)/grog"; + for f in $(GROG_); do \ + -$(RM) "$(DESTDIR)$(grog_dir)/$$f"; \ + $(INSTALL_SCRIPT) "$(srcdir)/$$f" "$(DESTDIR)$(grog_dir)/$$f"; \ + done; + +.PHONY: uninstall_data uninstall_sub: - $(RM) $(DESTDIR)$(bindir)/grog + -$(RM) "$(DESTDIR)$(bindir)/grog"; for f in $(GROG_); do \ - $(RM) $(DESTDIR)$(grog_dir)/$$f; \ + -$(RM) "$(DESTDIR)$(grog_dir)/$$f"; \ done; - -test -d $(DESTDIR)$(libdir)/groff/grog || \ - rmdir $(DESTDIR)$(libdir)/groff/grog; + -test -d "$(DESTDIR)$(libdir)/groff/grog" || \ + -rmdir "$(DESTDIR)$(libdir)/groff/grog"; + + +######################################################################## +# Emacs settings +######################################################################## +# +# Local Variables: +# mode: makefile +# End: |