Skip to content

Commit 87d8e05

Browse files
committed
linuxcnc-uspace: use dh_install to install the appropriate 'extra' files
1 parent 389cb7f commit 87d8e05

2 files changed

Lines changed: 14 additions & 3 deletions

File tree

debian/linuxcnc.install.in

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,15 @@
11
debian/linuxcnc-uspace.metainfo.xml usr/share/metainfo
2+
3+
debian/extras/etc /
4+
debian/extras/lib /
5+
6+
debian/extras/usr/share/icons usr/share
7+
8+
debian/extras/usr/share/applications/linuxcnc.desktop usr/share/applications
9+
debian/extras/usr/share/applications/linuxcnc-latency.desktop usr/share/applications
10+
debian/extras/usr/share/applications/linuxcnc-pncconf.desktop usr/share/applications
11+
debian/extras/usr/share/applications/linuxcnc-stepconf.desktop usr/share/applications
12+
13+
debian/extras/usr/share/desktop-directories/linuxcnc-cnc.directory usr/share/desktop-directories
14+
debian/extras/usr/share/desktop-directories/linuxcnc-doc.directory usr/share/desktop-directories
15+
debian/extras/usr/share/desktop-directories/linuxcnc-ref.directory usr/share/desktop-directories

debian/rules.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,7 @@ override_dh_auto_install-arch:
7373
DESTDIR=$(DESTDIR) $(MAKE) -C src install-software
7474
py3clean .
7575

76-
# Install all desktop files, application-menu entries, and associated
77-
# icons in DESTDIR.
7876
desktop-file-validate $(shell find debian/extras/ share/applications/ -name *.desktop);
79-
cd debian/extras && cp -a * $(DESTDIR)
8077

8178
# Install G-code quick reference docs in DESTDIR.
8279
# NOTE: This is arguably documentation, but it lives in the

0 commit comments

Comments
 (0)