linuxcnc-uspace-dev: install with dh_install

Author: SebKuzminsky

debian/.gitignore

@@ -13,6 +13,7 @@ linuxcnc-doc-*/
 # generated from `.in` by debian/configure
 linuxcnc-uspace.install
 linuxcnc-uspace.docs
+linuxcnc-uspace-dev.install
 
 *.debhelper
 shlibs.local

debian/configure

@@ -174,6 +174,8 @@ subst linuxcnc.install.in > ${MAIN_PACKAGE_NAME}.install
 subst linuxcnc.docs.in > ${MAIN_PACKAGE_NAME}.docs
 subst linuxcnc.lintian-overrides.in > ${MAIN_PACKAGE_NAME}.lintian-overrides
 
+subst linuxcnc-dev.install.in > ${MAIN_PACKAGE_NAME}-dev.install
+
 subst rules.in > rules
 chmod +x rules
 

debian/linuxcnc-dev.install.in

@@ -0,0 +1,7 @@
+usr/bin/halcompile
+usr/include/linuxcnc
+usr/lib/liblinuxcnc.a
+usr/lib/*.so
+usr/share/linuxcnc/Makefile.modinc
+usr/share/man/man1/halcompile.1
+usr/share/man/man3

debian/rules.in

@@ -75,27 +75,9 @@ override_dh_auto_install-arch:
 
 	desktop-file-validate $(shell find debian/extras/ -name *.desktop);
 
-	# Move static libraries to the -dev package.
-	mkdir -p debian/$(DEV_PACKAGE_NAME)/usr/lib
-	cp lib/*.a debian/$(DEV_PACKAGE_NAME)/usr/lib
-
 	mkdir -p $(DESTDIR)/usr/share/doc/linuxcnc/examples
 	cd $(DESTDIR)/usr/share/doc/linuxcnc/examples && ln -sf ../../../linuxcnc/ncfiles ./nc_files
 
-	# -dev
-	mkdir -p debian/$(DEV_PACKAGE_NAME)/usr/include
-	mv -t debian/$(DEV_PACKAGE_NAME)/usr/include $(DESTDIR)/usr/include/linuxcnc
-
-	mkdir -p debian/$(DEV_PACKAGE_NAME)/usr/lib
-	mv -t debian/$(DEV_PACKAGE_NAME)/usr/lib/ $(DESTDIR)/usr/lib/*.a $(DESTDIR)/usr/lib/*.so
-	mkdir -p debian/$(DEV_PACKAGE_NAME)/usr/bin
-	mv -t debian/$(DEV_PACKAGE_NAME)/usr/bin $(DESTDIR)/usr/bin/halcompile
-	mkdir -p debian/$(DEV_PACKAGE_NAME)/usr/share/man/man1
-	mv -t debian/$(DEV_PACKAGE_NAME)/usr/share/man/man1  $(DESTDIR)/usr/share/man/man1/halcompile.1
-	mv -t debian/$(DEV_PACKAGE_NAME)/usr/share/man $(DESTDIR)/usr/share/man/man3
-	mkdir -p debian/$(DEV_PACKAGE_NAME)/usr/share/linuxcnc
-	mv -t debian/$(DEV_PACKAGE_NAME)/usr/share/linuxcnc $(DESTDIR)/usr/share/linuxcnc/Makefile.modinc
-
 	# some clean-up
 	rm -f $(DESTDIR)/usr/share/doc/linuxcnc/examples/sample-configs/*/*position*.txt