From a8b366277db6e19ee4e6667b3e856f187e49a35f Mon Sep 17 00:00:00 2001
From: Marius Halden <marius.h@lden.org>
Date: Fri, 29 Apr 2016 14:48:32 +0200
Subject: Configure option for install-dev and install config sample
 automatically

---
 Makefile  | 22 ++++++++++++++++++----
 configure |  6 ++++++
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 3d930f97..95706534 100644
--- a/Makefile
+++ b/Makefile
@@ -25,10 +25,14 @@ ifdef DOC
 	$(MAKE) -C doc
 endif
 
-uninstall: uninstall-bin uninstall-doc 
+ifdef DEVEL
+INSTALL_DEV = install-dev
+UNINSTALL_DEV = uninstall-dev
+endif
+uninstall: uninstall-bin uninstall-doc  $(UNINSTALL_DEV)
 	@echo -e '\nmake uninstall does not remove files in '$(DESTDIR)$(ETCDIR)', you can use make uninstall-etc to do that.\n'
 
-install: install-bin install-doc install-plugins
+install: install-bin install-doc install-plugins install-etc $(INSTALL_DEV)
 	@echo
 	@echo Installed successfully
 	@echo
@@ -37,7 +41,9 @@ install: install-bin install-doc install-plugins
 ifdef SYSTEMDSYSTEMUNITDIR
 	@echo If you want to start BitlBee using systemd, try \"make install-systemd\".
 endif
+ifndef DEVEL
 	@echo To be able to compile third party plugins, run \"make install-dev\"
+endif
 	@echo
 
 .PHONY:   install   install-bin   install-etc   install-doc install-plugins install-systemd install-dev \
@@ -111,12 +117,20 @@ uninstall-dev:
 
 install-etc:
 	mkdir -p $(DESTDIR)$(ETCDIR)
-	$(INSTALL) -m 0644 $(_SRCDIR_)motd.txt $(DESTDIR)$(ETCDIR)/motd.txt
-	$(INSTALL) -m 0644 $(_SRCDIR_)bitlbee.conf $(DESTDIR)$(ETCDIR)/bitlbee.conf
+	$(INSTALL) -m 0644 $(_SRCDIR_)motd.txt $(DESTDIR)$(ETCDIR)/motd.txt.sample
+	$(INSTALL) -m 0644 $(_SRCDIR_)bitlbee.conf $(DESTDIR)$(ETCDIR)/bitlbee.conf.sample
+	@if ! [ -e $(DESTDIR)$(ETCDIR)/motd.txt ]; then \
+		$(INSTALL) -m 0644 $(_SRCDIR_)motd.txt $(DESTDIR)$(ETCDIR)/motd.txt; \
+	fi
+	@if ! [ -e $(DESTDIR)$(ETCDIR)/bitlbee.conf ]; then \
+		$(INSTALL) -m 0644 $(_SRCDIR_)bitlbee.conf $(DESTDIR)$(ETCDIR)/bitlbee.conf; \
+	fi
 
 uninstall-etc:
 	rm -f $(DESTDIR)$(ETCDIR)/motd.txt
+	rm -f $(DESTDIR)$(ETCDIR)/motd.txt.sample
 	rm -f $(DESTDIR)$(ETCDIR)/bitlbee.conf
+	rm -f $(DESTDIR)$(ETCDIR)/bitlbee.conf.sample
 	-rmdir $(DESTDIR)$(ETCDIR)
 
 install-plugins: install-plugin-otr install-plugin-skype
diff --git a/configure b/configure
index 9cc81794..8a62495a 100755
--- a/configure
+++ b/configure
@@ -47,6 +47,7 @@ asan=0
 plugins=1
 otr=0
 skype=0
+devel=0
 
 events=glib
 ssl=auto
@@ -150,6 +151,7 @@ Option		Description				Default
 		Disable/enable OTR encryption support	$otr
 --skype=0/1/plugin
 		Disable/enable Skype support		$skype
+--devel=0/1	Disable/enable header install	$devel
 
 --events=...	Event handler (glib, libevent)		$events
 --ssl=...	SSL library to use (gnutls, nss, openssl, auto)
@@ -296,6 +298,10 @@ else
 	[ -z "$CFLAGS" ] && CFLAGS="-O2 -fno-strict-aliasing"
 fi
 
+if [ "$devel" = "1" ]; then
+	echo 'DEVEL=1' >> Makefile.settings
+fi
+
 if [ "$pie" = "1" ]; then
 	echo 'CFLAGS_BITLBEE=-fPIE' >> Makefile.settings
 	echo 'LDFLAGS_BITLBEE=-pie' >> Makefile.settings
-- 
cgit v1.2.3