summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--bmcweb_config.h.in (renamed from config.h.in)0
-rw-r--r--http/http_connection.hpp2
-rw-r--r--meson.build4
4 files changed, 4 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index ef61d38b73..46831ebbd5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@
*.crt
*.key
-/include/config.h
+/include/bmcweb_config.h
# Created by https://www.toptal.com/developers/gitignore/api/osx,linux,windows,pycharm,intellij,visualstudio,visualstudiocode,eclipse,meson
# Edit at https://www.toptal.com/developers/gitignore?templates=osx,linux,windows,pycharm,intellij,visualstudio,visualstudiocode,eclipse,meson
diff --git a/config.h.in b/bmcweb_config.h.in
index 394cfdf16e..394cfdf16e 100644
--- a/config.h.in
+++ b/bmcweb_config.h.in
diff --git a/http/http_connection.hpp b/http/http_connection.hpp
index 6840fc0821..d7b74add60 100644
--- a/http/http_connection.hpp
+++ b/http/http_connection.hpp
@@ -1,5 +1,5 @@
#pragma once
-#include "config.h"
+#include "bmcweb_config.h"
#include "authorization.hpp"
#include "http_response.hpp"
diff --git a/meson.build b/meson.build
index a08c8dd3e9..48f7691389 100644
--- a/meson.build
+++ b/meson.build
@@ -339,8 +339,8 @@ conf_data.set('BMCWEB_HTTP_REQ_BODY_LIMIT_MB', get_option('http-body-limit'))
xss_enabled = get_option('insecure-disable-xss')
conf_data.set10('BMCWEB_INSECURE_DISABLE_XSS_PREVENTION', xss_enabled)
conf_data.set('MESON_INSTALL_PREFIX', get_option('prefix'))
-configure_file(input: 'config.h.in',
- output: 'config.h',
+configure_file(input: 'bmcweb_config.h.in',
+ output: 'bmcweb_config.h',
configuration: conf_data)
# Configure and install systemd unit files