From 0cf589e13d10ef5a6b893b4e4a6f48e7dd169777 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Mon, 29 Jan 2018 02:20:09 -0800 Subject: [PATCH] build: Don't provide iwd/main.conf during make install --- Makefile.am | 4 +--- bootstrap-configure | 5 ++--- {src => doc}/main.conf | 0 3 files changed, 3 insertions(+), 6 deletions(-) rename {src => doc}/main.conf (100%) diff --git a/Makefile.am b/Makefile.am index 2b94cb64..b005fd31 100644 --- a/Makefile.am +++ b/Makefile.am @@ -102,8 +102,6 @@ src_iwd_SOURCES = src/main.c linux/nl80211.h \ src_iwd_LDADD = ell/libell-internal.la -ldl -dist_sysconf_DATA = src/main.conf - client_iwctl_SOURCES = client/main.c \ client/adapter.c \ client/agent-manager.c \ @@ -267,7 +265,7 @@ if BUILD_DOCS dist_man_MANS = $(manual_pages) endif -EXTRA_DIST = src/genbuiltin $(manual_pages:.1=.txt) +EXTRA_DIST = src/genbuiltin doc/main.conf $(manual_pages:.1=.txt) AM_CFLAGS = -fvisibility=hidden diff --git a/bootstrap-configure b/bootstrap-configure index a5b45159..22e6a389 100755 --- a/bootstrap-configure +++ b/bootstrap-configure @@ -7,7 +7,6 @@ fi ./bootstrap && \ ./configure --enable-maintainer-mode \ --enable-debug \ + --prefix=/usr \ --localstatedir=/var \ - --prefix=/usr $* \ - --sysconfdir=/etc/iwd \ - --with-dbusconfdir=/etc + --with-dbusconfdir=/etc $* diff --git a/src/main.conf b/doc/main.conf similarity index 100% rename from src/main.conf rename to doc/main.conf