From 494f296a3baab08522617b24b1f126d8f9a17502 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 20 Jan 2016 16:26:51 +0100 Subject: Imported Upstream version 1.1.90 --- clients/cli/Makefile.am | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'clients/cli/Makefile.am') 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 -- cgit 1.3.0-6-gf8a5