Merge pull request #2 from theimpossibleastronaut/install-to-docs

Copy completions to docdir

completions/README.md

@@ -1,11 +1,10 @@
 # Shell completion scripts
 
-By default, rmw completions are installed when rmw is installed (This can be
-disabled by using '-Dinstall_shell_completions' during meson setup). If they
-aren't present on your system, you can install a shell completion manually by
-getting the completion from the rmw source package or git repository. See the
-links below for specific installation instructions for each completion.
-
+By default, rmw completions are copied to the rmw documentation dir when rmw
+is installed. If they aren't present on your system, you can install a shell
+completion manually by getting the completion from the source package or git
+repository. See the links below for specific installation instructions for
+each completion.
 
 ## Fish
 

meson.build

@@ -72,10 +72,6 @@ main_bin = executable(
 
 subdir ('man')
 
-if get_option('install_shell_completions')
-  subdir('completions')
-endif
-
 if get_option('build_tests')
   subdir ('test')
 endif
@@ -91,3 +87,10 @@ install_data(
     ),
   install_dir : get_option('docdir')
   )
+
+# Copy completions to docdir
+install_subdir(
+  'completions',
+  install_dir : join_paths(get_option('docdir')),
+  strip_directory : false
+  )