--- osquery/utils/config/default_paths.h	2020-04-30 20:41:20.000000000 -0400
+++ osquery/utils/config/default_paths.h	2020-04-30 23:57:42.000000000 -0400
@@ -41,10 +41,10 @@
 #define OSQUERY_LOG_HOME "/var/log/osquery/"
 #define OSQUERY_CERTS_HOME "/etc/ssl/"
 #else
-#define OSQUERY_HOME "/var/osquery/"
-#define OSQUERY_DB_HOME OSQUERY_HOME
-#define OSQUERY_SOCKET OSQUERY_DB_HOME
-#define OSQUERY_PIDFILE OSQUERY_DB_HOME
-#define OSQUERY_LOG_HOME "/var/log/osquery/"
-#define OSQUERY_CERTS_HOME OSQUERY_HOME "certs/"
+#define OSQUERY_HOME "@CONFPATH@/"
+#define OSQUERY_DB_HOME "@DATAPATH@/"
+#define OSQUERY_SOCKET "@RUNPATH@/"
+#define OSQUERY_PIDFILE "@RUNPATH@/"
+#define OSQUERY_LOG_HOME "@LOGPATH@/"
+#define OSQUERY_CERTS_HOME "@SHAREPATH@/" "certs/"
 #endif
