From 40e73b9edaeba2d7bf47434fd97af7a10bfbbe34 Mon Sep 17 00:00:00 2001 From: bwarken Date: Tue, 16 Apr 2013 19:00:42 +0000 Subject: 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'. --- src/roff/grog/Makefile.sub | 90 +++++++++++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 41 deletions(-) (limited to 'src') 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: /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: -- cgit v1.2.1