Skip to content

Commit eb27772

Browse files
committed
linuxcnc-doc-*: use dh_install and dh_installdocs
Install docs with dh_installdocs, other files (like .desktop entries) with dh_install. Install all docs in /usr/share/doc/linuxcnc, not /usr/share/doc/linuxcnc-uspace, because that's where the .desktop files look for the docs. Handle each lang explicitly because we'll need to different special things for -en vs all the others.
1 parent 307cbb8 commit eb27772

9 files changed

+50
-30
lines changed

debian/linuxcnc-doc-en.docs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
usr/share/doc/linuxcnc/LinuxCNC_Documentation.pdf
2+
usr/share/doc/linuxcnc/LinuxCNC_Getting_Started.pdf
3+
usr/share/doc/linuxcnc/LinuxCNC_Integrator.pdf
4+
usr/share/doc/linuxcnc/LinuxCNC_Manual_Pages.pdf
5+
6+
usr/share/doc/linuxcnc/AUTHORS
7+
usr/share/doc/linuxcnc/INSTALL.adoc
8+
usr/share/doc/linuxcnc/README.adoc
9+
usr/share/doc/linuxcnc/README.axis
10+
usr/share/doc/linuxcnc/axis_light_background
11+
usr/share/doc/linuxcnc/rtfaults.adoc
12+
usr/share/doc/linuxcnc/tklinuxcnc.adoc

debian/linuxcnc-doc-en.install

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
debian/extras/usr/share/applications/linuxcnc-documentation.desktop usr/share/applications
2+
debian/extras/usr/share/applications/linuxcnc-gcoderef.desktop usr/share/applications
3+
debian/extras/usr/share/applications/linuxcnc-gettingstarted.desktop usr/share/applications
4+
debian/extras/usr/share/applications/linuxcnc-integratorinfo.desktop usr/share/applications
5+
debian/extras/usr/share/applications/linuxcnc-manualpages.desktop usr/share/applications

debian/linuxcnc-doc-es.docs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
usr/share/doc/linuxcnc/LinuxCNC_Developer_es.pdf
2+
usr/share/doc/linuxcnc/LinuxCNC_Documentation_es.pdf
3+
usr/share/doc/linuxcnc/LinuxCNC_Getting_Started_es.pdf
4+
usr/share/doc/linuxcnc/LinuxCNC_Integrator_es.pdf
5+
6+
usr/share/doc/linuxcnc/asciidoc-markup_es.adoc
7+
usr/share/doc/linuxcnc/rtfaults_es.adoc

debian/linuxcnc-doc-es.install

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
debian/extras/usr/share/applications/*_es.desktop usr/share/applications/

debian/linuxcnc-doc-fr.docs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
usr/share/doc/linuxcnc/LinuxCNC_Developer_fr.pdf
2+
usr/share/doc/linuxcnc/LinuxCNC_Documentation_fr.pdf
3+
usr/share/doc/linuxcnc/LinuxCNC_Getting_Started_fr.pdf
4+
usr/share/doc/linuxcnc/LinuxCNC_Integrator_fr.pdf

debian/linuxcnc-doc-fr.install

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
debian/extras/usr/share/applications/*_fr.desktop usr/share/applications/

debian/linuxcnc-doc-zh-cn.docs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
usr/share/doc/linuxcnc/LinuxCNC_Developer_zh_CN.pdf
2+
usr/share/doc/linuxcnc/LinuxCNC_Documentation_zh_CN.pdf
3+
usr/share/doc/linuxcnc/LinuxCNC_Getting_Started_zh_CN.pdf
4+
usr/share/doc/linuxcnc/LinuxCNC_Integrator_zh_CN.pdf

debian/linuxcnc-doc-zh-cn.install

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
debian/extras/usr/share/applications/*_zh_CN.desktop usr/share/applications/

debian/rules.in

Lines changed: 15 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -109,36 +109,21 @@ override_dh_auto_install-arch:
109109
override_dh_auto_install-indep:
110110
DESTDIR=$(DESTDIR) $(MAKE) -C src install-docs install-doc
111111

112-
# Moving all language-specific .desktop files to the respective -doc-$$lang package
113-
for lang in zh_CN es fr; do \
114-
p=$$(echo $$lang | tr _ - | tr A-Z a-z); \
115-
d=debian/linuxcnc-doc-$$p/usr/share/applications/ ; \
116-
mkdir -p $$d ; \
117-
mv -t $$d $(DESTDIR)/usr/share/applications/*_$${lang}.desktop ; \
118-
done
119-
# Moving all remaining .desktop files to the default documentation
120-
d=debian/linuxcnc-doc-en/usr/share/applications/ ; \
121-
mkdir -p $$d ; \
122-
mv -t $$d $(DESTDIR)/usr/share/applications/linuxcnc-gettingstarted.desktop ; \
123-
mv -t $$d $(DESTDIR)/usr/share/applications/linuxcnc-documentation.desktop ; \
124-
mv -t $$d $(DESTDIR)/usr/share/applications/linuxcnc-integratorinfo.desktop ; \
125-
mv -t $$d $(DESTDIR)/usr/share/applications/linuxcnc-manualpages.desktop
126-
127-
# Only the English developer documentation goes to the -dev package
128-
# The translated developer documentation goes to the respective regular -doc package
129-
# english documentation has no "en" suffix
130-
if [ -r $(DESTDIR)/usr/share/doc/linuxcnc/LinuxCNC_Developer.pdf ]; then \
131-
mkdir -p debian/$(DEV_PACKAGE_NAME)/usr/share/doc/linuxcnc-dev; \
132-
mv -t debian/$(DEV_PACKAGE_NAME)/usr/share/doc/linuxcnc-dev/ $(DESTDIR)/usr/share/doc/linuxcnc/LinuxCNC_Developer.pdf; \
133-
mv -t debian/$(DEV_PACKAGE_NAME)/usr/share/doc/linuxcnc-dev/ $(DESTDIR)/usr/share/doc/linuxcnc/LinuxCNC_Developer_*.pdf; \
134-
for lang in zh_CN es fr; do \
135-
p=$$(echo $$lang | tr _ - | tr A-Z a-z); \
136-
d=debian/linuxcnc-doc-$$p/usr/share/doc/linuxcnc ; \
137-
mkdir -p $$d ; \
138-
find $(DESTDIR)/usr/share/doc/linuxcnc -name "*_$${lang}.pdf" | xargs -r mv -t $$d ; \
139-
done; \
140-
d=debian/linuxcnc-doc-en/usr/share/doc/linuxcnc && mkdir -p $$d && mv -t $$d $(DESTDIR)/usr/share/doc/linuxcnc/*.pdf; \
141-
fi
112+
override_dh_installdocs-indep:
113+
# Rename the "main" doc directories from
114+
# `usr/share/doc/@MAIN_PACKAGE_NAME@` to `usr/share/doc/linuxcnc`,
115+
# because that's where the `.desktop` files look for the docs.
116+
dh_installdocs --doc-main-package=@MAIN_PACKAGE_NAME@ --package=linuxcnc-doc-en
117+
mv debian/linuxcnc-doc-en/usr/share/doc/@MAIN_PACKAGE_NAME@ debian/linuxcnc-doc-en/usr/share/doc/linuxcnc
118+
119+
dh_installdocs --doc-main-package=@MAIN_PACKAGE_NAME@ --package=linuxcnc-doc-es
120+
mv debian/linuxcnc-doc-es/usr/share/doc/@MAIN_PACKAGE_NAME@ debian/linuxcnc-doc-es/usr/share/doc/linuxcnc
121+
122+
dh_installdocs --doc-main-package=@MAIN_PACKAGE_NAME@ --package=linuxcnc-doc-fr
123+
mv debian/linuxcnc-doc-fr/usr/share/doc/@MAIN_PACKAGE_NAME@ debian/linuxcnc-doc-fr/usr/share/doc/linuxcnc
124+
125+
dh_installdocs --doc-main-package=@MAIN_PACKAGE_NAME@ --package=linuxcnc-doc-zh-cn
126+
mv debian/linuxcnc-doc-zh-cn/usr/share/doc/@MAIN_PACKAGE_NAME@ debian/linuxcnc-doc-zh-cn/usr/share/doc/linuxcnc
142127

143128

144129
override_dh_compress:

0 commit comments

Comments
 (0)