Fixed install of systemd, init and pam scripts

ogon-project · Apr 16, 2021 · 3fbb763 · 3fbb763
1 parent e3724c6
commit 3fbb763
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/packaging/deb/ogon/rules b/packaging/deb/ogon/rules
@@ -41,12 +41,13 @@ override_dh_auto_configure:
 	dh_auto_configure -- $(DEB_CMAKE_EXTRA_FLAGS)
 
 override_dh_install:
-	cp obj-$(DEB_HOST_GNU_TYPE)/misc/ogon-session-manager.service debian/ogon-session-manager.service
-	cp obj-$(DEB_HOST_GNU_TYPE)/misc/ogon-rdp-server.service debian/ogon-rdp-server.service
-	cp obj-$(DEB_HOST_GNU_TYPE)/misc/ogon-session-manager.init debian/ogon-session-manager.init
-	cp obj-$(DEB_HOST_GNU_TYPE)/misc/ogon-rdp-server.init debian/ogon-rdp-server.init
-	cp misc/pam.d/ogon.debian debian/ogon.pam
-	cp obj-$(DEB_HOST_GNU_TYPE)/misc/config.ini.debian $(DESTDIR)/etc/ogon/config.ini
+	mkdir -p $(DESTDIR)/debian
+	cp obj-$(DEB_HOST_GNU_TYPE)/misc/ogon-session-manager.service debian/ogon-core.ogon-session-manager.service
+	cp obj-$(DEB_HOST_GNU_TYPE)/misc/ogon-rdp-server.service      debian/ogon-core.ogon-rdp-server.service
+	cp obj-$(DEB_HOST_GNU_TYPE)/misc/ogon-session-manager.init    debian/ogon-core.ogon-session-manager.init
+	cp obj-$(DEB_HOST_GNU_TYPE)/misc/ogon-rdp-server.init         debian/ogon-core.ogon-rdp-server.init
+	cp obj-$(DEB_HOST_GNU_TYPE)/misc/config.ini.debian            $(DESTDIR)/etc/ogon/config.ini
+	cp misc/pam.d/ogon.debian                                     debian/ogon-core.ogon.pam
 	dh_install
 	dh_missing --fail-missing
 
@@ -58,15 +59,15 @@ override_dh_clean:
 	dh_clean
 
 override_dh_systemd_enable:
-	  dh_systemd_enable -p ogon-core debian/ogon-rdp-server.service
-	  dh_systemd_enable -p ogon-core debian/ogon-session-manager.service
+	  dh_systemd_enable -p ogon-core debian/ogon-core.ogon-rdp-server.service
+	  dh_systemd_enable -p ogon-core debian/ogon-core.ogon-session-manager.service
 
 override_dh_systemd_start:
-	dh_systemd_start -p ogon-core debian/ogon-rdp-server.service
-	dh_systemd_start -p ogon-core debian/ogon-session-manager.service
+	dh_systemd_start -p ogon-core debian/ogon-core.ogon-rdp-server.service
+	dh_systemd_start -p ogon-core debian/ogon-core.ogon-session-manager.service
 
 override_dh_installpam:
-	dh_installpam -p ogon-core --name ogon
+	dh_installpam -p ogon-core --name=ogon
 
 override_dh_installinit:
 	dh_installinit -p ogon-core --name ogon-rdp-server