update and cleanup

CMakeLists.txt

@@ -15,6 +15,8 @@ include(GNUInstallDirs)
 set(HYPRLAND_VERSION ${VER})
 set(PREFIX ${CMAKE_INSTALL_PREFIX})
 set(INCLUDEDIR ${CMAKE_INSTALL_INCLUDEDIR})
+set(bindir ${CMAKE_INSTALL_BINDIR})
+set(prefix ${CMAKE_INSTALL_PREFIX})
 configure_file(hyprland.pc.in hyprland.pc @ONLY)
 configure_file(systemd/hyprland-session.service.in systemd/hyprland-session.service @ONLY)
 

systemd/hyprland-session.service.in

@@ -9,8 +9,8 @@ After=graphical-session-pre.target
 
 [Service]
 Type=notify
-ExecStart=@CMAKE_INSTALL_PREFIX@@prefix@/bin/Hyprland
-ExecStop=@CMAKE_INSTALL_PREFIX@@prefix@/bin/hyprctl dispatch exit
-ExecStopPost=@CMAKE_INSTALL_PREFIX@@prefix@/bin/systemctl --user unset-environment DISPLAY WAYLAND_DISPLAY HYPRLAND_INSTANCE_SIGNATURE XDG_CURRENT_DESKTOP
+ExecStart=@prefix@/@bindir@/Hyprland
+ExecStop=@prefix@/@bindir@/hyprctl dispatch exit
+ExecStopPost=systemctl --user unset-environment DISPLAY WAYLAND_DISPLAY HYPRLAND_INSTANCE_SIGNATURE XDG_CURRENT_DESKTOP
 Restart=on-failure
 Slice=session.slice

systemd/meson.build

@@ -5,14 +5,13 @@ install_data(
 )                                                                      
 
 prefix = get_option('prefix')
+bindir = get_option('bindir')
 conf_data = configuration_data()
 conf_data.set('prefix', prefix)
+conf_data.set('bindir', bindir)
 
-
-  configure_file(
-    configuration: conf_data,
-    input: 'hyprland-session.service.in',
-    output: '@BASENAME@',
-    install_dir: join_paths(get_option('libdir'), 'systemd/user')  )
-
-
+configure_file(
+  configuration: conf_data,
+  input: 'hyprland-session.service.in',
+  output: '@BASENAME@',
+  install_dir: join_paths(get_option('libdir'), 'systemd/user')  )