sox-devel@lists.sourceforge.net unofficial mirror
 help / color / mirror / code / Atom feed
* [PATCH 1/2] fix out of tree text/pdf/html generation
@ 2018-04-27 13:16 Mans Rullgard
  2018-04-27 13:16 ` [PATCH 2/2] Fix Bug #261: absurd docs bug - PDF is doubled Mans Rullgard
  0 siblings, 1 reply; 2+ messages in thread
From: Mans Rullgard @ 2018-04-27 13:16 UTC (permalink / raw)
  To: sox-devel

The source dir is already included in $<.
---
 Makefile.am | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 12076b137936..fefa1869a632 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,22 +28,22 @@ README: README.sh FEATURES.in
 
 # Rule for making text man pages.  Uses GNU nroff's -c so not portable.
 .1.txt:
-	tbl $(srcdir)/$< | nroff -man -c | sed "s/.\b//g" > $@
+	tbl $< | nroff -man -c | sed "s/.\b//g" > $@
 .3.txt:
-	tbl $(srcdir)/$< | nroff -man -c | sed "s/.\b//g" > $@
+	tbl $< | nroff -man -c | sed "s/.\b//g" > $@
 .7.txt:
-	tbl $(srcdir)/$< | nroff -man -c | sed "s/.\b//g" > $@
+	tbl $< | nroff -man -c | sed "s/.\b//g" > $@
 
 DOCTXT = sox.txt soxi.txt soxformat.txt libsox.txt README
 txt: $(DOCTXT)
 
 # Rule for making PDF man pages
 .1.pdf:
-	pdfroff -t -man -Tps $(srcdir)/$< > $@
+	pdfroff -t -man -Tps $< > $@
 .3.pdf:
-	pdfroff -t -man -Tps $(srcdir)/$< > $@
+	pdfroff -t -man -Tps $< > $@
 .7.pdf:
-	pdfroff -t -man -Tps $(srcdir)/$< > $@
+	pdfroff -t -man -Tps $< > $@
 
 DOCPDF = sox.pdf soxi.pdf soxformat.pdf libsox.pdf
 pdf: $(DOCPDF)
@@ -78,11 +78,11 @@ distclean-local:
 FIXHTML = sed 's,<head>,&<link rel="stylesheet" href="http://sox.sourceforge.net/pub/skins/sox/sox.css" type="text/css"></link>,' 
 
 .1.html:
-	groff -t -man -Thtml -P -Dsoxpng $(srcdir)/$< | $(FIXHTML) > $@
+	groff -t -man -Thtml -P -Dsoxpng $< | $(FIXHTML) > $@
 .3.html:
-	groff -t -man -Thtml -P -Dsoxpng $(srcdir)/$< | $(FIXHTML) > $@
+	groff -t -man -Thtml -P -Dsoxpng $< | $(FIXHTML) > $@
 .7.html:
-	groff -t -man -Thtml -P -Dsoxpng $(srcdir)/$< | $(FIXHTML) > $@
+	groff -t -man -Thtml -P -Dsoxpng $< | $(FIXHTML) > $@
 
 DOCHTML = sox.html soxi.html soxformat.html libsox.html
 html: $(DOCHTML)
-- 
2.17.0


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
SoX-devel mailing list
SoX-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/sox-devel

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [PATCH 2/2] Fix Bug #261: absurd docs bug - PDF is doubled
  2018-04-27 13:16 [PATCH 1/2] fix out of tree text/pdf/html generation Mans Rullgard
@ 2018-04-27 13:16 ` Mans Rullgard
  0 siblings, 0 replies; 2+ messages in thread
From: Mans Rullgard @ 2018-04-27 13:16 UTC (permalink / raw)
  To: sox-devel; +Cc: Kevin Conder

From: Kevin Conder <kwconder@yahoo.com>

The problem is when any PDF is created, the result is two duplicate
documents concatenated together.

Solution: Add the "--no-toc-relocation" parameter to pdfroff as a
work-around.

[ew: format + edit commit message, add references:
 https://bugs.debian.org/538326
 http://lists.gnu.org/archive/html/groff/2009-08/msg00028.html
 ]

Reviewed-by: Eric Wong <normalperson@yhbt.net>
---
 Makefile.am | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index fefa1869a632..35d06abdc6e7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,11 +39,11 @@ txt: $(DOCTXT)
 
 # Rule for making PDF man pages
 .1.pdf:
-	pdfroff -t -man -Tps $< > $@
+	pdfroff -t -man --no-toc-relocation -Tps $< > $@
 .3.pdf:
-	pdfroff -t -man -Tps $< > $@
+	pdfroff -t -man --no-toc-relocation -Tps $< > $@
 .7.pdf:
-	pdfroff -t -man -Tps $< > $@
+	pdfroff -t -man --no-toc-relocation -Tps $< > $@
 
 DOCPDF = sox.pdf soxi.pdf soxformat.pdf libsox.pdf
 pdf: $(DOCPDF)
-- 
2.17.0


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
SoX-devel mailing list
SoX-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/sox-devel

^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-04-27 13:17 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-27 13:16 [PATCH 1/2] fix out of tree text/pdf/html generation Mans Rullgard
2018-04-27 13:16 ` [PATCH 2/2] Fix Bug #261: absurd docs bug - PDF is doubled Mans Rullgard

Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/sox.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).