Skip to content

Commit af60c76

Browse files
committed
move g-code quick ref from linuxcnc-uspace to doc debs
The new translation infrastructure means we need to build the translated docs to generate the g-code quick refs. Since we have separate "-arch" and "-indep" targets in debian/rules now, we don't build the docs when building linuxcnc-uspace, so the g-code refs need to move to the doc debs.
1 parent eb27772 commit af60c76

File tree

5 files changed

+18
-6
lines changed

5 files changed

+18
-6
lines changed

debian/linuxcnc-doc-en.docs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,5 @@ usr/share/doc/linuxcnc/README.axis
1010
usr/share/doc/linuxcnc/axis_light_background
1111
usr/share/doc/linuxcnc/rtfaults.adoc
1212
usr/share/doc/linuxcnc/tklinuxcnc.adoc
13+
14+
docs/html/gcode.html

debian/linuxcnc-doc-es.docs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@ usr/share/doc/linuxcnc/LinuxCNC_Integrator_es.pdf
55

66
usr/share/doc/linuxcnc/asciidoc-markup_es.adoc
77
usr/share/doc/linuxcnc/rtfaults_es.adoc
8+
9+
docs/html/es/gcode.html

debian/linuxcnc-doc-fr.docs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ usr/share/doc/linuxcnc/LinuxCNC_Developer_fr.pdf
22
usr/share/doc/linuxcnc/LinuxCNC_Documentation_fr.pdf
33
usr/share/doc/linuxcnc/LinuxCNC_Getting_Started_fr.pdf
44
usr/share/doc/linuxcnc/LinuxCNC_Integrator_fr.pdf
5+
6+
docs/html/fr/gcode.html

debian/linuxcnc-doc-zh-cn.docs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ usr/share/doc/linuxcnc/LinuxCNC_Developer_zh_CN.pdf
22
usr/share/doc/linuxcnc/LinuxCNC_Documentation_zh_CN.pdf
33
usr/share/doc/linuxcnc/LinuxCNC_Getting_Started_zh_CN.pdf
44
usr/share/doc/linuxcnc/LinuxCNC_Integrator_zh_CN.pdf
5+
6+
docs/html/zh_CN/gcode.html

debian/rules.in

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,6 @@ override_dh_auto_install-arch:
7575

7676
desktop-file-validate $(shell find debian/extras/ share/applications/ -name *.desktop);
7777

78-
# Install G-code quick reference docs in DESTDIR.
79-
# NOTE: This is arguably documentation, but it lives in the
80-
# architecture-dependent binary package for historical reasons.
81-
mkdir -p $(DESTDIR)/usr/share/doc/linuxcnc
82-
cp docs/html/gcode*.html $(DESTDIR)/usr/share/doc/linuxcnc/
83-
8478
# Move static libraries to the -dev package.
8579
mkdir -p debian/$(DEV_PACKAGE_NAME)/usr/lib
8680
cp lib/*.a debian/$(DEV_PACKAGE_NAME)/usr/lib
@@ -110,19 +104,29 @@ override_dh_auto_install-indep:
110104
DESTDIR=$(DESTDIR) $(MAKE) -C src install-docs install-doc
111105

112106
override_dh_installdocs-indep:
107+
# The G-code quick reference html docs are built as
108+
# `docs/html/${LANG}/gcode.html`. We install them
109+
# into `/usr/share/doc/@MAIN_PACKAGE_NAME@/` in each
110+
# linuxcnc-doc-${LANG} package, then rename them there (except
111+
# for the English one) to include the language in the filename,
112+
# so they don't collide when we install all the doc debs.
113+
#
113114
# Rename the "main" doc directories from
114115
# `usr/share/doc/@MAIN_PACKAGE_NAME@` to `usr/share/doc/linuxcnc`,
115116
# because that's where the `.desktop` files look for the docs.
116117
dh_installdocs --doc-main-package=@MAIN_PACKAGE_NAME@ --package=linuxcnc-doc-en
117118
mv debian/linuxcnc-doc-en/usr/share/doc/@MAIN_PACKAGE_NAME@ debian/linuxcnc-doc-en/usr/share/doc/linuxcnc
118119

119120
dh_installdocs --doc-main-package=@MAIN_PACKAGE_NAME@ --package=linuxcnc-doc-es
121+
mv debian/linuxcnc-doc-es/usr/share/doc/@MAIN_PACKAGE_NAME@/gcode.html debian/linuxcnc-doc-es/usr/share/doc/@MAIN_PACKAGE_NAME@/gcode_es.html
120122
mv debian/linuxcnc-doc-es/usr/share/doc/@MAIN_PACKAGE_NAME@ debian/linuxcnc-doc-es/usr/share/doc/linuxcnc
121123

122124
dh_installdocs --doc-main-package=@MAIN_PACKAGE_NAME@ --package=linuxcnc-doc-fr
125+
mv debian/linuxcnc-doc-fr/usr/share/doc/@MAIN_PACKAGE_NAME@/gcode.html debian/linuxcnc-doc-fr/usr/share/doc/@MAIN_PACKAGE_NAME@/gcode_fr.html
123126
mv debian/linuxcnc-doc-fr/usr/share/doc/@MAIN_PACKAGE_NAME@ debian/linuxcnc-doc-fr/usr/share/doc/linuxcnc
124127

125128
dh_installdocs --doc-main-package=@MAIN_PACKAGE_NAME@ --package=linuxcnc-doc-zh-cn
129+
mv debian/linuxcnc-doc-zh-cn/usr/share/doc/@MAIN_PACKAGE_NAME@/gcode.html debian/linuxcnc-doc-zh-cn/usr/share/doc/@MAIN_PACKAGE_NAME@/gcode_zh_CN.html
126130
mv debian/linuxcnc-doc-zh-cn/usr/share/doc/@MAIN_PACKAGE_NAME@ debian/linuxcnc-doc-zh-cn/usr/share/doc/linuxcnc
127131

128132

0 commit comments

Comments
 (0)