[Groff-commit] groff ChangeLog doc/Makefile.in doc/Makefile.sub

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Werner LEMBERG <wl>     12/09/20 18:19:38

Modified files:
        .              : ChangeLog 
        doc            : Makefile.in Makefile.sub 

Log message:
        Simplify enviroment handling.
        
        Suggested by Ivan Shmakov <address@hidden>.
        
        * doc/Makefile.in, doc/Makefile.sub (GROFF): Don't use export.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1352&r2=1.1353
http://cvs.savannah.gnu.org/viewcvs/groff/doc/Makefile.in?cvsroot=groff&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/groff/doc/Makefile.sub?cvsroot=groff&r1=1.36&r2=1.37

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1352
retrieving revision 1.1353
diff -u -b -r1.1352 -r1.1353
--- ChangeLog   20 Sep 2012 07:48:28 -0000      1.1352
+++ ChangeLog   20 Sep 2012 18:19:37 -0000      1.1353
@@ -1,3 +1,11 @@
+2012-09-20  Werner LEMBERG  <address@hidden>
+
+       Simplify enviroment handling.
+
+       Suggested by Ivan Shmakov <address@hidden>.
+
+       * doc/Makefile.in, doc/Makefile.sub (GROFF): Don't use export.
+
 2012-09-20  Deri James  <address@hidden>
 
        [gropdf] Various minor fixes.

Index: doc/Makefile.in
===================================================================
RCS file: /cvsroot/groff/groff/doc/Makefile.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- doc/Makefile.in     26 Jul 2011 17:11:09 -0000      1.27
+++ doc/Makefile.in     20 Sep 2012 18:19:38 -0000      1.28
@@ -73,12 +73,11 @@
 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; \
+GROFF=\
       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
 
 imagedir=img
 

Index: doc/Makefile.sub
===================================================================
RCS file: /cvsroot/groff/groff/doc/Makefile.sub,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- doc/Makefile.sub    26 Jul 2011 17:11:09 -0000      1.36
+++ doc/Makefile.sub    20 Sep 2012 18:19:38 -0000      1.37
@@ -39,12 +39,10 @@
 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 \