Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use better defaults for installation directories #574

Merged
merged 2 commits into from
Aug 4, 2021
Merged

Use better defaults for installation directories #574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7393a1
Use better defaults for installation directories
bjoernricks Aug 4, 2021
cdf3202
Add changelog entry
bjoernricks Aug 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,20 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [Unreleased]
## [20.8.4] - Unreleased
### Added
### Changed
* Use better defaults for installation directories [#574](https://github.com/greenbone/gvm-libs/pull/574)
* SYSCONFDIR is /etc by default now
* LOCALSTATEDIR is /var by default now
* Introduced GVM_RUN_DIR that uses /run/gvm by default
* GVM_PID_DIR is /run/gvm by default now

### Deprecated
### Removed
### Fixed

[Unreleased]: https://github.com/greenbone/gvm-libs/compare/v20.8.3...HEAD
[20.8.4]: https://github.com/greenbone/gvm-libs/compare/v20.8.3...gvm-libs-20.08


## [20.8.3] - 2021-08-03
Expand Down
10 changes: 7 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ if (SYSCONF_INSTALL_DIR)
endif (SYSCONF_INSTALL_DIR)

if (NOT SYSCONFDIR)
set (SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/etc")
set (SYSCONFDIR "/etc")
endif (NOT SYSCONFDIR)

if (NOT EXEC_PREFIX)
Expand Down Expand Up @@ -168,7 +168,7 @@ if (NOT LIBDIR)
endif (NOT LIBDIR)

if (NOT LOCALSTATEDIR)
set (LOCALSTATEDIR "${CMAKE_INSTALL_PREFIX}/var")
set (LOCALSTATEDIR "/var")
endif (NOT LOCALSTATEDIR)

if (NOT INCLUDEDIR)
Expand All @@ -179,8 +179,12 @@ if (NOT DATADIR)
set (DATADIR "${CMAKE_INSTALL_PREFIX}/share")
endif (NOT DATADIR)

if (NOT GVM_RUN_DIR)
set (GVM_RUN_DIR "/run/gvm")
endif (NOT GVM_RUN_DIR)

if (NOT GVM_PID_DIR)
set (GVM_PID_DIR "${LOCALSTATEDIR}/run")
set (GVM_PID_DIR "${GVM_RUN_DIR}")
endif (NOT GVM_PID_DIR)

if (NOT GVM_SYSCONF_DIR)
Expand Down