summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2015-12-05 18:16:45 -0500
committerLibravatar Drew DeVault <sir@cmpwn.com>2015-12-05 18:16:45 -0500
commit762a78be3ca22767b94adf5bba4668047aa80e4e (patch)
tree53cf05c4a723991b1da13f835297a2d1fb420d5e
parentFree outputs on registry teardown (diff)
parentmove manpages to subfolders (diff)
downloadsway-762a78be3ca22767b94adf5bba4668047aa80e4e.tar.gz
sway-762a78be3ca22767b94adf5bba4668047aa80e4e.tar.zst
sway-762a78be3ca22767b94adf5bba4668047aa80e4e.zip
Merge pull request #292 from christophgysin/man
move manpages to subfolders
-rw-r--r--CMakeLists.txt8
-rw-r--r--sway/CMakeLists.txt3
-rw-r--r--sway/sway.1.txt (renamed from sway.1.txt)0
-rw-r--r--sway/sway.5.txt (renamed from sway.5.txt)0
-rw-r--r--swaygrab/CMakeLists.txt2
-rw-r--r--swaygrab/swaygrab.1.txt (renamed from swaygrab.1.txt)0
-rw-r--r--swaymsg/CMakeLists.txt2
-rw-r--r--swaymsg/swaymsg.1.txt (renamed from swaymsg.1.txt)0
8 files changed, 9 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75c61c2a..1ae7bf26 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,6 +49,8 @@ find_package(WLC REQUIRED)
49find_package(Wayland REQUIRED) 49find_package(Wayland REQUIRED)
50find_package(XKBCommon REQUIRED) 50find_package(XKBCommon REQUIRED)
51 51
52include(Manpage)
53
52include_directories(include) 54include_directories(include)
53 55
54add_subdirectory(protocols) 56add_subdirectory(protocols)
@@ -61,12 +63,6 @@ add_subdirectory(swaymsg)
61add_subdirectory(swaygrab) 63add_subdirectory(swaygrab)
62add_subdirectory(swaybar) 64add_subdirectory(swaybar)
63 65
64include(Manpage)
65add_manpage(sway 1)
66add_manpage(sway 5)
67add_manpage(swaymsg 1)
68add_manpage(swaygrab 1)
69
70install( 66install(
71 FILES ${CMAKE_CURRENT_SOURCE_DIR}/sway.desktop 67 FILES ${CMAKE_CURRENT_SOURCE_DIR}/sway.desktop
72 DESTINATION share/wayland-sessions 68 DESTINATION share/wayland-sessions
diff --git a/sway/CMakeLists.txt b/sway/CMakeLists.txt
index 49ed24e7..aa553492 100644
--- a/sway/CMakeLists.txt
+++ b/sway/CMakeLists.txt
@@ -46,3 +46,6 @@ install(
46 DESTINATION ${FALLBACK_CONFIG_DIR} 46 DESTINATION ${FALLBACK_CONFIG_DIR}
47 COMPONENT configuration 47 COMPONENT configuration
48) 48)
49
50add_manpage(sway 1)
51add_manpage(sway 5)
diff --git a/sway.1.txt b/sway/sway.1.txt
index 402b2d77..402b2d77 100644
--- a/sway.1.txt
+++ b/sway/sway.1.txt
diff --git a/sway.5.txt b/sway/sway.5.txt
index 24467d22..24467d22 100644
--- a/sway.5.txt
+++ b/sway/sway.5.txt
diff --git a/swaygrab/CMakeLists.txt b/swaygrab/CMakeLists.txt
index d5468cda..f664c01d 100644
--- a/swaygrab/CMakeLists.txt
+++ b/swaygrab/CMakeLists.txt
@@ -13,3 +13,5 @@ install(
13 DESTINATION bin 13 DESTINATION bin
14 COMPONENT runtime 14 COMPONENT runtime
15) 15)
16
17add_manpage(swaygrab 1)
diff --git a/swaygrab.1.txt b/swaygrab/swaygrab.1.txt
index cd4b8bd2..cd4b8bd2 100644
--- a/swaygrab.1.txt
+++ b/swaygrab/swaygrab.1.txt
diff --git a/swaymsg/CMakeLists.txt b/swaymsg/CMakeLists.txt
index 2481b280..06939991 100644
--- a/swaymsg/CMakeLists.txt
+++ b/swaymsg/CMakeLists.txt
@@ -12,3 +12,5 @@ install(
12 DESTINATION bin 12 DESTINATION bin
13 COMPONENT runtime 13 COMPONENT runtime
14) 14)
15
16add_manpage(swaymsg 1)
diff --git a/swaymsg.1.txt b/swaymsg/swaymsg.1.txt
index 984780fa..984780fa 100644
--- a/swaymsg.1.txt
+++ b/swaymsg/swaymsg.1.txt