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
D
deb-pkg
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
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
deb-pkg
Commits
9411e875
Commit
9411e875
authored
Aug 21, 2015
by
Daniel Salzman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Makefile: don't install bash completition
parent
c01f62cb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
29 deletions
+1
-29
Makefile.am
Makefile.am
+1
-2
configure.ac
configure.ac
+0
-18
samples/Makefile.am
samples/Makefile.am
+0
-9
No files found.
Makefile.am
View file @
9411e875
...
...
@@ -5,8 +5,7 @@ singlehtml install-singlehtml:
$(MAKE)
-C
doc
$@
AM_DISTCHECK_CONFIGURE_FLAGS
=
\
--disable-code-coverage
\
--without-bash-completions
--disable-code-coverage
CODE_COVERAGE_INFO
=
coverage.info
CODE_COVERAGE_HTML
=
coverage.html
...
...
configure.ac
View file @
9411e875
...
...
@@ -374,24 +374,6 @@ AS_IF([test "$with_libidn" != "no"],[
]) # Knot DNS utilities dependencies
# Bash completions
AC_ARG_WITH([bash-completions],
AC_HELP_STRING([--with-bash-completions=[DIR]], [Bash completions directory [default=auto]]),
[with_bash_completions="$withval"],
[with_bash_completions=auto]
)
AS_CASE([$with_bash_completions],
[auto], [PKG_CHECK_VAR([bash_completions_dir], [bash-completion], [completionsdir])],
[yes], [PKG_CHECK_VAR([bash_completions_dir], [bash-completion], [completionsdir], [], [AC_MSG_ERROR([bash completions not found])])],
[no], [bash_completions_dir=],
[bash_completions_dir="$with_bash_completions"]
)
AM_CONDITIONAL([HAVE_BASH_COMPLETIONS], [test -n "$bash_completions_dir"])
AS_IF([test -n "$bash_completions_dir"],
[bash_completions_output="${bash_completions_dir}"],
[bash_completions_output=no]
)
AC_SEARCH_LIBS([pow], [m])
AC_SEARCH_LIBS([pthread_create], [pthread], [], [AC_MSG_ERROR([pthreads not found])])
AC_SEARCH_LIBS([dlopen], [dl])
...
...
samples/Makefile.am
View file @
9411e875
...
...
@@ -24,19 +24,10 @@ install-data-local: knot.sample.conf
$(INSTALL)
-d
$(DESTDIR)
/
$(config_dir)
;
\
$(INSTALL_DATA)
knot.sample.conf
$(srcdir)
/example.com.zone
$(DESTDIR)
/
$(config_dir)
;
\
fi
if
HAVE_BASH_COMPLETIONS
if
[
\!
-f
$(DESTDIR)/$(bash_completions_dir)/keymgr
];
then
\
$(INSTALL)
-d
$(DESTDIR)/$(bash_completions_dir);
\
$(INSTALL_DATA)
$(srcdir)/keymgr-completion.sh
$(DESTDIR)/$(bash_completions_dir)/keymgr;
\
fi
endif
# HAVE_BASH_COMPLETIONS
uninstall-local
:
-
rm
-rf
$(DESTDIR)
/
$(config_dir)
/knot.sample.conf
\
$(DESTDIR)
/
$(config_dir)
/example.com.zone
if
HAVE_BASH_COMPLETIONS
-rm
-rf
$(DESTDIR)/$(bash_completions_dir)/keymgr
endif
# HAVE_BASH_COMPLETIONS
endif
# HAVE_DAEMON
...
...
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