From 2cb476e845e74c24176af66b4a79f76d2824100a Mon Sep 17 00:00:00 2001
From: nixo <nicolo@nixo.xyz>
Date: Mon, 11 May 2020 13:36:06 +0200
Subject: [PATCH] [build] install all resources

---
 meson.build                            | 25 ++++++++++++++-----------
 share/applications/i3.desktop          |  6 +++---
 share/xsessions/i3-with-shmlog.desktop |  6 ------
 share/xsessions/i3.desktop             | 12 ++++++------
 4 files changed, 23 insertions(+), 26 deletions(-)
 delete mode 100644 share/xsessions/i3-with-shmlog.desktop

diff --git a/meson.build b/meson.build
index d0d085d2..89383df4 100644
--- a/meson.build
+++ b/meson.build
@@ -107,7 +107,7 @@ libi3_sources = [
   'libi3/ucs2_conversion.c',
 ]
 
-i3lib = static_library('i3', libi3_sources,
+gri3lib = static_library('i3', libi3_sources,
 		       include_directories: include_directories('include'),
 		       dependencies: [
 			 libm_dep,
@@ -134,7 +134,7 @@ i3lib = static_library('i3', libi3_sources,
 			 xcb_icccm_dep,
 		       ])
 
-executable('i3-wm-guile', sources,
+executable('gri3', sources,
 	   include_directories :
 	     [
 	       include_directories('include'),
@@ -166,17 +166,15 @@ executable('i3-wm-guile', sources,
 	     xcb_xrm_dep,
 	     xcb_icccm_dep,
 	   ],
-	   link_with: i3lib,
+	   link_with: gri3lib,
 	   install: true,
 	   link_args: ['-lrt', '-lev'])
 
-
-executable('i3-nagbar', './i3-nagbar/main.c',
+executable('gri3-nagbar', './i3-nagbar/main.c',
 	   include_directories: include_directories('include'),
 	   dependencies: [ pango_dep, sn_dep ],
 	   install: true,
-	   link_with: i3lib)
-
+	   link_with: gri3lib)
 
 executable('i3bar',
 	   [
@@ -196,11 +194,16 @@ executable('i3bar',
 	     ],
 	   dependencies: [ pango_dep, sn_dep ],
 	   link_args: ['-lrt', '-lev'],
-	   link_with: i3lib,
+	   link_with: gri3lib,
 	   install: true)
 
-
-executable('i3-msg', 'i3-msg/main.c', 
+executable('gri3-msg', 'i3-msg/main.c', 
 	   include_directories: include_directories('include'),
-	   dependencies: pango_dep, link_with: i3lib,
+	   dependencies: pango_dep, link_with: gri3lib,
 	   install: true)
+
+install_data(sources : [ 'etc/config.scm', 'etc/hooks.scm' ], install_dir : 'etc/gri3/')
+install_data(sources : [ 'etc/config.scm', 'etc/hooks.scm' ], install_dir : 'etc/gri3/')
+install_headers('include/ipc.h', subdir : 'gri3')
+install_subdir('share/applications', install_dir : 'share')
+install_subdir('share/xsessions', install_dir : 'share')
\ No newline at end of file
diff --git a/share/applications/i3.desktop b/share/applications/i3.desktop
index 28445922..6635836c 100644
--- a/share/applications/i3.desktop
+++ b/share/applications/i3.desktop
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Type=Application
-Name=i3
+Name=gri3
 NoDisplay=true
 GenericName=A dynamic tiling window manager
 Comment=improved dynamic tiling window manager
-Exec=i3
-X-GNOME-WMName=i3
+Exec=gri3
+X-GNOME-WMName=gri3
 X-GNOME-Autostart-Phase=WindowManager
 X-GNOME-Provides=windowmanager
 X-GNOME-Autostart-Notify=false
diff --git a/share/xsessions/i3-with-shmlog.desktop b/share/xsessions/i3-with-shmlog.desktop
deleted file mode 100644
index 3c634500..00000000
--- a/share/xsessions/i3-with-shmlog.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Name=i3 (with debug log)
-Comment=improved dynamic tiling window manager
-Exec=i3-with-shmlog
-Type=Application
-Keywords=tiling;wm;windowmanager;window;manager;
diff --git a/share/xsessions/i3.desktop b/share/xsessions/i3.desktop
index 11a64e26..4a5feff5 100644
--- a/share/xsessions/i3.desktop
+++ b/share/xsessions/i3.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
-Name=i3
-Comment=improved dynamic tiling window manager
-Exec=i3
-TryExec=i3
+Name=gri3
+Comment=guile really improved i3
+Exec=gri3
+TryExec=gri3
 Type=Application
-X-LightDM-DesktopName=i3
-DesktopNames=i3
+X-LightDM-DesktopName=gri3
+DesktopNames=gri3
 Keywords=tiling;wm;windowmanager;window;manager;