diff options
| author | Michael Biebl <biebl@debian.org> | 2016-01-20 16:27:43 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-01-20 16:27:43 +0100 |
| commit | cbb3b57b5b60dbf1eadb795c834ac511f5e1ba21 (patch) | |
| tree | a97e7cf8b8903a2902c34f586661a13da2a9f2ea /clients/cli/Makefile.am | |
| parent | 5ddbb9de1f57acaeb47a151404bcf5f8c9729276 (diff) | |
| parent | 494f296a3baab08522617b24b1f126d8f9a17502 (diff) | |
Merge tag 'upstream/1.1.90' into experimental
Upstream version 1.1.90
Diffstat (limited to 'clients/cli/Makefile.am')
| -rw-r--r-- | clients/cli/Makefile.am | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/clients/cli/Makefile.am b/clients/cli/Makefile.am index 2f394098..dfcb1e96 100644 --- a/clients/cli/Makefile.am +++ b/clients/cli/Makefile.am @@ -1,11 +1,13 @@ +if BUILD_NMCLI + bin_PROGRAMS = \ nmcli AM_CPPFLAGS = \ -I${top_srcdir} \ -I${top_builddir} \ - -I${top_srcdir}/include \ - -I$(top_builddir)/include \ + -I${top_srcdir}/shared \ + -I$(top_builddir)/shared \ -I${top_srcdir}/libnm-core \ -I${top_builddir}/libnm-core \ -I${top_srcdir}/libnm \ @@ -14,9 +16,7 @@ AM_CPPFLAGS = \ $(GLIB_CFLAGS) \ -DG_LOG_DOMAIN=\""nmcli"\" \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ - -DNMCLI_LOCALEDIR=\"$(datadir)/locale\" \ - -DNMCONFDIR=\"$(nmconfdir)\" \ - -DNMLIBDIR=\"$(libdir)\" + -DNMCLI_LOCALEDIR=\"$(datadir)/locale\" nmcli_SOURCES = \ agent.c \ @@ -75,3 +75,5 @@ uninstall-hook: rm -f $(DESTDIR)$(completiondir)/nmcli EXTRA_DIST += nmcli-completion + +endif |