diff options
| author | wl <wl> | 2012-09-20 18:19:37 +0000 |
|---|---|---|
| committer | wl <wl> | 2012-09-20 18:19:37 +0000 |
| commit | 8bc356c00c25029d73eeeea25f43a34ac478866b (patch) | |
| tree | b476e17363ebe3dbbbad7d71eafdee1a6eecd879 | |
| parent | 61d103280358052d9009d1eabb764c23b2c47fa1 (diff) | |
| download | groff-8bc356c00c25029d73eeeea25f43a34ac478866b.tar.gz | |
Simplify enviroment handling.
Suggested by Ivan Shmakov <oneingray@gmail.com>.
* doc/Makefile.in, doc/Makefile.sub (GROFF): Don't use export.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | doc/Makefile.in | 11 | ||||
| -rw-r--r-- | doc/Makefile.sub | 8 |
3 files changed, 16 insertions, 11 deletions
@@ -1,3 +1,11 @@ +2012-09-20 Werner LEMBERG <wl@gnu.org> + + Simplify enviroment handling. + + Suggested by Ivan Shmakov <oneingray@gmail.com>. + + * doc/Makefile.in, doc/Makefile.sub (GROFF): Don't use export. + 2012-09-20 Deri James <deri@chuzzlewit.myzen.co.uk> [gropdf] Various minor fixes. diff --git a/doc/Makefile.in b/doc/Makefile.in index b8a18d78..420db849 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -73,12 +73,11 @@ FFLAG=-F$(top_builddir)/font -F$(top_srcdir)/font TFLAG=-M$(top_builddir)/tmac -M$(top_srcdir)/tmac TROFF=$(TROFFBIN) $(TFLAG) $(FFLAG) -ww -GROFF=GROFF_COMMAND_PREFIX=''; \ - export GROFF_COMMAND_PREFIX; \ - GROFF_BIN_PATH=$(GROFF_BIN_PATH); \ - export GROFF_BIN_PATH; \ - sed -e "s;@VERSION@;$(version)$(revision);" $< \ - | $(GROFFBIN) $(TFLAG) $(FFLAG) -Upet -ww +GROFF=\ + sed -e "s;@VERSION@;$(version)$(revision);" $< \ + | GROFF_COMMAND_PREFIX= \ + GROFF_BIN_PATH="$(GROFF_BIN_PATH)" \ + $(GROFFBIN) $(TFLAG) $(FFLAG) -Upet -ww imagedir=img diff --git a/doc/Makefile.sub b/doc/Makefile.sub index a35a41c2..9bc06d09 100644 --- a/doc/Makefile.sub +++ b/doc/Makefile.sub @@ -39,12 +39,10 @@ FFLAG=-F$(top_builddir)/font -F$(top_srcdir)/font TFLAG=-M$(top_builddir)/tmac -M$(top_srcdir)/tmac GROFF=\ - GROFF_COMMAND_PREFIX=''; \ - export GROFF_COMMAND_PREFIX; \ - GROFF_BIN_PATH=$(GROFF_BIN_PATH); \ - export GROFF_BIN_PATH; \ sed -e "s;@VERSION@;$(version)$(revision);" $< \ - | $(GROFFBIN) $(TFLAG) $(FFLAG) -Upet -ww + | GROFF_COMMAND_PREFIX= \ + GROFF_BIN_PATH="$(GROFF_BIN_PATH)" \ + $(GROFFBIN) $(TFLAG) $(FFLAG) -Upet -ww DOCFILES=\ meref.me \ |