Skip to content

Commit 5085b9c

Browse files
committed
Build the man-pages properly during deb creation
Have debian/rules do it instead of your own Makefile
1 parent 4c41d1c commit 5085b9c

File tree

4 files changed

+5
-14
lines changed

4 files changed

+5
-14
lines changed

.gitignore

-4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,3 @@ coverage
2727
.coverage
2828
.tox
2929
.cache
30-
31-
# Generated documentation
32-
docs/_build
33-
man/

Makefile

+2-8
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ DIST_DSC=dist/$(NAME)_$(VER)$(DEB_SUFFIX).tar.xz \
6060
dist/$(NAME)_$(VER)$(DEB_SUFFIX)_source.build \
6161
dist/$(NAME)_$(VER)$(DEB_SUFFIX)_source.buildinfo \
6262
dist/$(NAME)_$(VER)$(DEB_SUFFIX)_source.changes
63-
MAN_PAGES=man/pinout.1 man/remote-gpio.7
6463

6564

6665
# Default target
@@ -123,11 +122,6 @@ tags: $(PY_SOURCES)
123122
$(SUBDIRS):
124123
$(MAKE) -C $@
125124

126-
$(MAN_PAGES): $(DOC_SOURCES)
127-
$(PYTHON) $(PYFLAGS) setup.py build_sphinx -b man
128-
mkdir -p man/
129-
cp build/sphinx/man/*.[0-9] man/
130-
131125
$(DIST_TAR): $(PY_SOURCES) $(SUBDIRS)
132126
$(PYTHON) $(PYFLAGS) setup.py sdist --formats gztar
133127

@@ -137,7 +131,7 @@ $(DIST_ZIP): $(PY_SOURCES) $(SUBDIRS)
137131
$(DIST_WHEEL): $(PY_SOURCES) $(SUBDIRS)
138132
$(PYTHON) $(PYFLAGS) setup.py bdist_wheel --universal
139133

140-
$(DIST_DEB): $(PY_SOURCES) $(SUBDIRS) $(DEB_SOURCES) $(MAN_PAGES)
134+
$(DIST_DEB): $(PY_SOURCES) $(SUBDIRS) $(DEB_SOURCES)
141135
# build the binary package in the parent directory then rename it to
142136
# project_version.orig.tar.gz
143137
$(PYTHON) $(PYFLAGS) setup.py sdist --dist-dir=../
@@ -146,7 +140,7 @@ $(DIST_DEB): $(PY_SOURCES) $(SUBDIRS) $(DEB_SOURCES) $(MAN_PAGES)
146140
mkdir -p dist/
147141
for f in $(DIST_DEB); do cp ../$${f##*/} dist/; done
148142

149-
$(DIST_DSC): $(PY_SOURCES) $(SUBDIRS) $(DEB_SOURCES) $(MAN_PAGES)
143+
$(DIST_DSC): $(PY_SOURCES) $(SUBDIRS) $(DEB_SOURCES)
150144
# build the source package in the parent directory then rename it to
151145
# project_version.orig.tar.gz
152146
$(PYTHON) $(PYFLAGS) setup.py sdist --dist-dir=../

debian/python3-gpiozero.manpages

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
man/pinout.1
2-
man/remote-gpio.7
1+
build/man/pinout.1
2+
build/man/remote-gpio.7

debian/rules

+1
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,4 @@ override_dh_auto_test:
2424
override_dh_auto_build:
2525
dh_auto_build
2626
PYTHONPATH=. sphinx-build -N -bhtml docs/ build/html
27+
PYTHONPATH=. sphinx-build -N -bman docs/ build/man

0 commit comments

Comments
 (0)