Skip to content

phillip/fix-bug-cmake-lists: fixed hard-coded path#742

Merged
zakird merged 2 commits intomainfrom
phillip/fix-bug-cmake-lists
Nov 17, 2023
Merged

phillip/fix-bug-cmake-lists: fixed hard-coded path#742
zakird merged 2 commits intomainfrom
phillip/fix-bug-cmake-lists

Conversation

@phillip-stephens
Copy link
Contributor

@phillip-stephens phillip-stephens commented Nov 17, 2023

Changes

  • one-line fix to use the CONFIG_DESTINATION variable instead of a hard-coded value (/etc/zmap) for the install path for the config files

Testing

Per INSTALL.md, I ran cmake -DRESPECT_INSTALL_PREFIX_CONFIG=ON .; make -j4; make install

This was output for make install. You can see the *.conf files were installed not at the usual /etc/zmap but at /usr/local/etc/zmap/, showing the config install prefix was respected.

-- Installing: /usr/local/etc/zmap/blocklist.conf
-- Installing: /usr/local/etc/zmap/zmap.conf
-- Installing: /usr/local/sbin/zmap
-- Installing: /usr/local/sbin/zblocklist
-- Installing: /usr/local/sbin/ziterate
-- Installing: /usr/local/sbin/ztee
-- Installing: /usr/local/share/man/man1/zmap.1
-- Installing: /usr/local/share/man/man1/zblocklist.1
-- Installing: /usr/local/share/man/man1/ziterate.1
-- Installing: /usr/local/share/man/man1/ztee.1
root@d7cfd2688d1b:/zmap#

@phillip-stephens phillip-stephens linked an issue Nov 17, 2023 that may be closed by this pull request
@phillip-stephens phillip-stephens marked this pull request as ready for review November 17, 2023 04:35
@zakird
Copy link
Member

zakird commented Nov 17, 2023

Fixes #735

@zakird zakird merged commit c4931bd into main Nov 17, 2023
@zakird zakird deleted the phillip/fix-bug-cmake-lists branch November 17, 2023 04:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Bogus check for config file existence

2 participants