diff --git a/analyzer/meson.build b/analyzer/meson.build
index 909155d..5d0dabe 100644
--- a/analyzer/meson.build
+++ b/analyzer/meson.build
@@ -20,10 +20,10 @@
     analyzer_src,
     include_directories : incdir,
     dependencies : analyzer_deps,
-    cpp_args : test_arg,
+    cpp_args : [ package_args, test_arg ],
     install : false,
 )
 
-# Install the RAS data files
+# Install the RAS data files.
 subdir('ras-data')
 
diff --git a/analyzer/ras-data/meson.build b/analyzer/ras-data/meson.build
index 23644d5..2c40fbd 100644
--- a/analyzer/ras-data/meson.build
+++ b/analyzer/ras-data/meson.build
@@ -7,7 +7,5 @@
     explorer_data_files,
 ]
 
-install_data( data_files, install_dir : join_paths(get_option('prefix'),
-                                                   get_option('datadir'),
-                                                   meson.project_name()) )
+install_data( data_files, install_dir : package_dir )