summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwl <wl>2012-09-20 18:17:03 +0000
committerwl <wl>2012-09-20 18:17:03 +0000
commitec487b71c1649ec3b62a958c011c9d099aa1b5ea (patch)
treeae9376a65d47395482185e9e249c7720bdb0e06f
parent1be7153efcd1ccbfd4e10a1a4e4a7e1bc05ee2d5 (diff)
downloadgroff-ec487b71c1649ec3b62a958c011c9d099aa1b5ea.tar.gz
Simplify enviroment handling.
-rw-r--r--contrib/mom/ChangeLog6
-rw-r--r--contrib/mom/Makefile.sub25
2 files changed, 16 insertions, 15 deletions
diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog
index 02b9cd8c..9c03bbdf 100644
--- a/contrib/mom/ChangeLog
+++ b/contrib/mom/ChangeLog
@@ -1,3 +1,7 @@
+* Thu Sep 20 2012
+
+o Simplify enviroment handling.
+
* Fri Aug 31 2012
o Version 2.0 release. Changes documented in version-2.html in
@@ -1402,7 +1406,7 @@ o Added "Next," "Prev" and "Top" links to top and bottom of doc files.
o Fixed some typos in the docs.
-Copyright 2004-2011
+Copyright 2004-2012
Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
diff --git a/contrib/mom/Makefile.sub b/contrib/mom/Makefile.sub
index 21dacf58..9d30b226 100644
--- a/contrib/mom/Makefile.sub
+++ b/contrib/mom/Makefile.sub
@@ -1,4 +1,4 @@
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2009
+# Copyright (C) 2002-2006, 2009, 2012
# Free Software Foundation, Inc.
# Written by Werner Lemberg (wl@gnu.org)
#
@@ -31,19 +31,16 @@ groff_bin_dirs=\
FFLAG=-F$(top_builddir)/font -F$(top_srcdir)/font
TFLAG=-M$(top_builddir)/tmac -M$(top_srcdir)/tmac -M$(srcdir)
-GROFF=GROFF_COMMAND_PREFIX=''; \
- export GROFF_COMMAND_PREFIX; \
- GROFF_BIN_PATH=$(GROFF_BIN_PATH); \
- export GROFF_BIN_PATH; \
- $(GROFFBIN) $(FFLAG) $(TFLAG)
-
-PDFMOM=GROFF_COMMAND_PREFIX=''; \
- export GROFF_COMMAND_PREFIX; \
- GROFF_BIN_PATH=$(GROFF_BIN_PATH); \
- export GROFF_BIN_PATH; \
- PDFMOM_BIN_PATH=$(top_builddir)/src/devices/gropdf; \
- export PDFMOM_BIN_PATH; \
- $(PDFMOMBIN) $(FFLAG) $(TFLAG)
+GROFF=\
+ GROFF_COMMAND_PREFIX= \
+ GROFF_BIN_PATH="$(GROFF_BIN_PATH)" \
+ $(GROFFBIN) $(FFLAG) $(TFLAG)
+
+PDFMOM=\
+ GROFF_COMMAND_PREFIX= \
+ GROFF_BIN_PATH="$(GROFF_BIN_PATH)" \
+ PDFMOM_BIN_PATH="$(top_builddir)/src/devices/gropdf" \
+ $(PDFMOMBIN) $(FFLAG) $(TFLAG)
MAN7=\
groff_mom.n