From 92436474e11c6a70e67afe957cf213fa196fc226 Mon Sep 17 00:00:00 2001
From: John <ebusd@ebusd.eu>
Date: Sun, 10 Apr 2022 17:03:28 +0200
Subject: [PATCH] add mqtt int files to inst target

---
 CMakeLists.txt |  3 +++
 Makefile.am    |  8 +++++++-
 make_debian.sh | 10 ++--------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 79bf9ee9..32eca74b 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -158,3 +158,6 @@ if(EXISTS "${ROOT}/etc/debian_version")
   install(FILES ${CMAKE_SOURCE_DIR}/contrib/debian/init.d/ebusd DESTINATION /etc/init.d/)
   install(FILES ${CMAKE_SOURCE_DIR}/contrib/debian/systemd/ebusd.service DESTINATION /lib/systemd/system/)
 endif()
+if(HAVE_MQTT)
+  install(FILES ${CMAKE_SOURCE_DIR}/contrib/etc/ebusd/mqtt-*.cfg DESTINATION /etc/ebusd/)
+endif(HAVE_MQTT)
\ No newline at end of file
diff --git a/Makefile.am b/Makefile.am
index 17567f24..586820b0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,13 +11,19 @@ EXTRA_DIST = LICENSE \
 	README.md \
 	VERSION
 
+if MQTT
+MQTT_INST_ADD = mkdir -p $(DESTDIR)/etc/ebusd/; \
+	cp -n $(srcdir)/contrib/etc/ebusd/mqtt-*.cfg $(DESTDIR)/etc/ebusd
+endif
+
 install-data-hook:
 	@if [ -f "/etc/debian_version" ]; then \
 	  mkdir -p $(DESTDIR)/etc/default/ $(DESTDIR)/etc/init.d/ $(DESTDIR)/lib/systemd/system/; \
 	  cp -n $(srcdir)/contrib/debian/default/ebusd $(DESTDIR)/etc/default/; \
 	  cp $(srcdir)/contrib/debian/init.d/ebusd $(DESTDIR)/etc/init.d/; \
 	  cp $(srcdir)/contrib/debian/systemd/ebusd.service $(DESTDIR)/lib/systemd/system/; \
-	fi
+	fi \
+	$(MQTT_INST_ADD)
 
 test:
 	$(MAKE) -C src/lib/ebus/test
diff --git a/make_debian.sh b/make_debian.sh
index 055dfbcf..2c696716 100755
--- a/make_debian.sh
+++ b/make_debian.sh
@@ -113,10 +113,6 @@ echo " pack"
 echo "*************"
 echo
 mkdir -p $RELEASE/DEBIAN $RELEASE/etc/logrotate.d || exit 1
-if [ -n "$mqtt" ]; then
-  mkdir -p $RELEASE/etc/ebusd || exit 1
-  cp contrib/etc/ebusd/mqtt*.cfg $RELEASE/etc/ebusd/ || exit 1
-fi
 cp contrib/etc/logrotate.d/ebusd $RELEASE/etc/logrotate.d/ || exit 1
 cp ChangeLog.md $RELEASE/DEBIAN/changelog || exit 1
 cat <<EOF > $RELEASE/DEBIAN/control
@@ -144,11 +140,9 @@ EOF
 cat <<EOF > $RELEASE/DEBIAN/conffiles
 /etc/default/ebusd
 EOF
-if [ -n "$mqtt" ]; then
+if [ -d "$RELEASE/etc/ebusd" ]; then
   echo '/etc/ebusd' >> $RELEASE/DEBIAN/dirs
-  for i in contrib/etc/ebusd/mqtt*.cfg; do
-    echo "${i##contrib}" >> $RELEASE/DEBIAN/conffiles
-  done
+  (cd $RELEASE && for i in etc/ebusd/*; do echo "/$i"; done) >> $RELEASE/DEBIAN/conffiles
 fi
 cat <<EOF > $RELEASE/DEBIAN/postinst
 #!/bin/sh