From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 29 Mar 2013 02:54:22 +0000 (-0400)
Subject: build-sys: remove papersize option from sphinx
X-Git-Tag: v201~167
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c8c9c69f390ea9cf8e700515757d18fc08d8c4fe;p=elogind.git

build-sys: remove papersize option from sphinx

We don't use it currently for anything (no latex output),
but it was messing up stuff if /etc/papersize had comments.
---

diff --git a/Makefile.am b/Makefile.am
index e44b07501..923f81bb2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3685,8 +3685,7 @@ src/python-systemd/id128-constants.h: src/systemd/sd-messages.h Makefile
 BUILT_SOURCES += \
 	src/python-systemd/id128-constants.h
 
-PAPER = $(shell cat /etc/papersize 2>/dev/null || echo a4)
-SPHINXOPTS = -D latex_paper_size=$(PAPER) -D version=$(VERSION) -D release=$(VERSION)
+SPHINXOPTS = -D version=$(VERSION) -D release=$(VERSION)
 sphinx-%:
 	$(AM_V_at)test -n "$(SPHINX_BUILD)" || { echo " *** sphinx-build is not available"; exit 1; }
 	$(AM_V_GEN)PYTHONPATH=$(DESTDIR)$(pyexecdir) LD_LIBRARY_PATH=$(DESTDIR)$(libdir) $(SPHINX_BUILD) -b $* $(SPHINXOPTS) $(top_srcdir)/src/python-systemd/docs $(top_builddir)/docs/html/python-systemd/