diff --git a/Makefile b/Makefile index a274747..c6abc6b 100644 --- a/Makefile +++ b/Makefile @@ -16,6 +16,7 @@ test: @cargo test install: target/release/steamos-manager target/release/steamosctl + install -d -m0755 "$(DESTDIR)/usr/share/dbus-1/interaces/" install -d -m0755 "$(DESTDIR)/usr/share/dbus-1/services/" install -d -m0755 "$(DESTDIR)/usr/share/dbus-1/system-services/" install -d -m0755 "$(DESTDIR)/usr/share/dbus-1/system.d/" @@ -29,6 +30,8 @@ install: target/release/steamos-manager target/release/steamosctl install -m644 "data/platform.toml" "$(DESTDIR)/usr/share/steamos-manager/" + install -D -m644 -t "$(DESTDIR)/usr/share/dbus-1/interfaces" "data/interfaces/"* + install -m644 "data/system/com.steampowered.SteamOSManager1.service" "$(DESTDIR)/usr/share/dbus-1/system-services/" install -m644 "data/system/com.steampowered.SteamOSManager1.conf" "$(DESTDIR)/usr/share/dbus-1/system.d/" install -m644 "data/system/steamos-manager.service" "$(DESTDIR)/usr/lib/systemd/system/" diff --git a/com.steampowered.SteamOSManager1.Manager.xml b/data/interfaces/com.steampowered.SteamOSManager1.Manager.xml similarity index 100% rename from com.steampowered.SteamOSManager1.Manager.xml rename to data/interfaces/com.steampowered.SteamOSManager1.Manager.xml diff --git a/com.steampowered.SteamOSManager1.xml b/data/interfaces/com.steampowered.SteamOSManager1.xml similarity index 100% rename from com.steampowered.SteamOSManager1.xml rename to data/interfaces/com.steampowered.SteamOSManager1.xml diff --git a/steamos-manager/src/manager/user.rs b/steamos-manager/src/manager/user.rs index 8f1d118..0557e88 100644 --- a/steamos-manager/src/manager/user.rs +++ b/steamos-manager/src/manager/user.rs @@ -1342,7 +1342,7 @@ mod test { .await .expect("remote"); let local = testing::InterfaceIntrospection::from_local( - "../com.steampowered.SteamOSManager1.Manager.xml", + "../data/interfaces/com.steampowered.SteamOSManager1.Manager.xml", "com.steampowered.SteamOSManager1.Manager", ) .await @@ -1354,7 +1354,7 @@ mod test { let remote = testing::InterfaceIntrospection::from_remote::(connection, MANAGER_PATH).await?; let local = testing::InterfaceIntrospection::from_local( - "../com.steampowered.SteamOSManager1.xml", + "../data/interfaces/com.steampowered.SteamOSManager1.xml", I::name().to_string(), ) .await?; diff --git a/steamos-manager/src/udev.rs b/steamos-manager/src/udev.rs index 221f7dc..fa0543e 100644 --- a/steamos-manager/src/udev.rs +++ b/steamos-manager/src/udev.rs @@ -213,7 +213,7 @@ mod test { .await .expect("remove"); let local = testing::InterfaceIntrospection::from_local( - "../com.steampowered.SteamOSManager1.xml", + "../data/interfaces/com.steampowered.SteamOSManager1.xml", UdevDbusObject::name().to_string(), ) .await