Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Knot DNS
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
22
Issues
22
List
Boards
Labels
Service Desk
Milestones
Merge Requests
17
Merge Requests
17
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Knot projects
Knot DNS
Commits
26668c55
Commit
26668c55
authored
Jul 04, 2013
by
Jan Včelák
🚀
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
configure: add --with-configdir option, defaults to $(sysconfdir)/knot
issue
#64
parent
5c053845
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
12 deletions
+20
-12
configure.ac
configure.ac
+6
-0
samples/Makefile.am
samples/Makefile.am
+10
-9
samples/knot.sample.conf.in
samples/knot.sample.conf.in
+1
-1
src/Makefile.am
src/Makefile.am
+3
-2
No files found.
configure.ac
View file @
26668c55
...
...
@@ -177,6 +177,12 @@ AC_ARG_WITH([storage],
[storage_dir=$withval])
AC_SUBST(storage_dir)
config_dir="${sysconfdir}/knot"
AC_ARG_WITH([configdir],
AC_HELP_STRING([--with-configdir=path], [Default directory for configuration. [default=$(sysconfdir)/knot]]),
[config_dir=$withval])
AC_SUBST(config_dir)
# Checks for libraries.
# FIXME: Replace `main' with a function in `-lm':
...
...
samples/Makefile.am
View file @
26668c55
...
...
@@ -3,7 +3,8 @@ edit = sed \
-e
's|@package[@]|
$(PACKAGE_NAME)
|g'
\
-e
's|@localstatedir[@]|
$(localstatedir)
|g'
\
-e
's|@prefix[@]|
$(prefix)
|g'
\
-e
's|@sysconfdir[@]|
$(sysconfdir)
|g'
-e
's|@sysconfdir[@]|
$(sysconfdir)
|g'
\
-e
's|@config_dir[@]|
$(config_dir)
|g'
knot.sample.conf
:
knot.sample.conf.in
rm
-f
$@
$@
.tmp
...
...
@@ -15,16 +16,16 @@ knot.sample.conf: knot.sample.conf.in
EXTRA_DIST
=
knot.sample.conf.in knot.full.conf knot.keys.conf example.com.zone
install-data-local
:
knot.sample.conf
[
-d
$(DESTDIR)
/
$(
sysconf
dir)
]
||
\
$(INSTALL)
-d
$(DESTDIR)
/
$(
sysconf
dir)
[
-f
$(DESTDIR)
/
$(
sysconf
dir)
/knot.sample.conf
]
||
\
$(INSTALL_DATA)
knot.sample.conf
$(srcdir)
/example.com.zone
$(DESTDIR)
/
$(
sysconf
dir)
[
-d
$(DESTDIR)
/
$(
config_
dir)
]
||
\
$(INSTALL)
-d
$(DESTDIR)
/
$(
config_
dir)
[
-f
$(DESTDIR)
/
$(
config_
dir)
/knot.sample.conf
]
||
\
$(INSTALL_DATA)
knot.sample.conf
$(srcdir)
/example.com.zone
$(DESTDIR)
/
$(
config_
dir)
uninstall-local
:
[
-f
$(DESTDIR)
/
$(
sysconf
dir)
/knot.sample.conf
]
&&
\
rm
-f
$(DESTDIR)
/
$(
sysconf
dir)
/knot.sample.conf
[
-f
$(DESTDIR)
/
$(
sysconf
dir)
/example.com.zone
]
&&
\
rm
-f
$(DESTDIR)
/
$(
sysconf
dir)
/example.com.zone
[
-f
$(DESTDIR)
/
$(
config_
dir)
/knot.sample.conf
]
&&
\
rm
-f
$(DESTDIR)
/
$(
config_
dir)
/knot.sample.conf
[
-f
$(DESTDIR)
/
$(
config_
dir)
/example.com.zone
]
&&
\
rm
-f
$(DESTDIR)
/
$(
config_
dir)
/example.com.zone
clean-local
:
rm
-f
knot.sample.conf
samples/knot.sample.conf.in
View file @
26668c55
...
...
@@ -61,7 +61,7 @@ control {
zones {
# Example master zone
# example.com {
# file "@
sysconf
dir@/example.com.zone";
# file "@
config_
dir@/example.com.zone";
# xfr-out slave0;
# notify-out slave0;
# }
...
...
src/Makefile.am
View file @
26668c55
...
...
@@ -8,8 +8,8 @@ noinst_LTLIBRARIES = libknot.la libknotd.la libknots.la libzscanner.la
# $(YACC) will generate header file
AM_CPPFLAGS
=
-I
$(top_srcdir)
/src/libknot
-DSYSCONFDIR
=
'"
$(sysconfdir)
"'
\
-DSBINDIR
=
'"
$(sbindir)
"'
-D
STORAGE_DIR
=
'"
${storage
_dir}
"'
\
-DRUN_DIR
=
'"
${run_dir}
"'
-DSBINDIR
=
'"
$(sbindir)
"'
-D
CONFIG_DIR
=
'"
${config
_dir}
"'
\
-D
STORAGE_DIR
=
'"
${storage_dir}
"'
-D
RUN_DIR
=
'"
${run_dir}
"'
AM_YFLAGS
=
-d
libknotd_la_YFLAGS
=
-pcf_
-d
libknotd_la_LFLAGS
=
# TODO: reentrant parser, prefix
...
...
@@ -316,5 +316,6 @@ zscanner_tool_LDADD = libknots.la libknot.la libknotd.la libzscanner.la @LIBOBJS
# Create storage and run-time directories
install-data-hook
:
$(INSTALL)
-d
$(DESTDIR)
/@config_dir@
$(INSTALL)
-d
$(DESTDIR)
/@run_dir@
$(INSTALL)
-d
$(DESTDIR)
/@storage_dir@
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment