[Groff-commit] groff/contrib/pdfmark ChangeLog Makefile.sub

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Werner LEMBERG <wl>     11/12/26 08:20:54

Modified files:
        contrib/pdfmark: ChangeLog Makefile.sub 

Log message:
        Fix parallel build race failure.
        
        Sometimes building in parallel will fail in the pdfmark directory:
        
          make[2]: Entering directory '.../contrib/pdfmark'
          rm -f pdfroff
          rm -f pdfmark.pdf
          sed -f ... ./pdfroff.sh >pdfroff
          ...; ./pdfroff ... pdfmark.ms >pdfmark.pdf
          /bin/sh: ./pdfroff: Permission denied
          chmod +x pdfroff
          make[2]: *** [pdfmark.pdf] Error 126
        
        This is because the generated pdf files use the local generated
        pdfroff helper script, but they don't depend directly upon it, so
        make tries to create the two in parallel and randomly falls over.
        
        * Makefile.sub: Have all the .pdf files explicitly depend on the
        `pdfroff' helper script.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/pdfmark/ChangeLog?cvsroot=groff&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/pdfmark/Makefile.sub?cvsroot=groff&r1=1.13&r2=1.14

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/contrib/pdfmark/ChangeLog,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- ChangeLog   23 Dec 2010 21:24:53 -0000      1.29
+++ ChangeLog   26 Dec 2011 08:20:53 -0000      1.30
@@ -1,3 +1,25 @@
+2011-12-26  Mike Frysinger  <address@hidden>
+
+       Fix parallel build race failure.
+
+       Sometimes building in parallel will fail in the pdfmark directory:
+
+         make[2]: Entering directory '.../contrib/pdfmark'
+         rm -f pdfroff
+         rm -f pdfmark.pdf
+         sed -f ... ./pdfroff.sh >pdfroff
+         ...; ./pdfroff ... pdfmark.ms >pdfmark.pdf
+         /bin/sh: ./pdfroff: Permission denied
+         chmod +x pdfroff
+         make[2]: *** [pdfmark.pdf] Error 126
+
+       This is because the generated pdf files use the local generated
+       pdfroff helper script, but they don't depend directly upon it, so
+       make tries to create the two in parallel and randomly falls over.
+
+       * Makefile.sub: Have all the .pdf files explicitly depend on the
+       `pdfroff' helper script.
+
 2010-12-23  Keith Marshall  <address@hidden>
 
        Update copyright notices; pdfmark.tmac bug-fix.
@@ -314,7 +336,7 @@
 
        First import of pdfmark files.
 
-Copyright 2004, 2005, 2006, 2007, 2008
+Copyright 2004-2011
   Free Software Foundation, Inc.
 
 Copying and distribution of this file, with or without modification,

Index: Makefile.sub
===================================================================
RCS file: /cvsroot/groff/groff/contrib/pdfmark/Makefile.sub,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- Makefile.sub        14 Dec 2010 22:09:28 -0000      1.13
+++ Makefile.sub        26 Dec 2011 08:20:53 -0000      1.14
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006, 2009, 2011 Free Software Foundation, Inc.
 #      Written by Keith Marshall (address@hidden)
 # 
 # This file is part of groff.
@@ -66,6 +66,9 @@
 
 all: pdfroff $(make_pdfdoc)
 
+# The pdf files use the local script to generate.
+$(PDFDOCFILES): pdfroff
+
 pdfdoc: gnu.eps $(PDFDOCFILES)
 
 gnu.eps: