move etc/ebusd creation to top level only, avoid deb error for empty etc/ebusd

This commit is contained in:
John
2022-04-10 18:03:06 +02:00
parent 4aa2181417
commit e8e7772dbb
3 changed files with 4 additions and 7 deletions
+3 -3
View File
@@ -12,12 +12,12 @@ EXTRA_DIST = LICENSE \
VERSION VERSION
if MQTT if MQTT
MQTT_INST_ADD = mkdir -p $(DESTDIR)/etc/ebusd/; \ MQTT_INST_ADD = cp -n $(srcdir)/contrib/etc/ebusd/mqtt-*.cfg $(DESTDIR)$(sysconfdir)/ebusd
cp -n $(srcdir)/contrib/etc/ebusd/mqtt-*.cfg $(DESTDIR)/etc/ebusd
endif endif
install-data-hook: install-data-hook:
@if [ -f "/etc/debian_version" ]; then \ @[ -d $(DESTDIR)$(sysconfdir)/ebusd ] || mkdir -p $(DESTDIR)$(sysconfdir)/ebusd; \
if [ -f "/etc/debian_version" ]; then \
mkdir -p $(DESTDIR)/etc/default/ $(DESTDIR)/etc/init.d/ $(DESTDIR)/lib/systemd/system/; \ mkdir -p $(DESTDIR)/etc/default/ $(DESTDIR)/etc/init.d/ $(DESTDIR)/lib/systemd/system/; \
cp -n $(srcdir)/contrib/debian/default/ebusd $(DESTDIR)/etc/default/; \ 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/init.d/ebusd $(DESTDIR)/etc/init.d/; \
+1 -1
View File
@@ -140,7 +140,7 @@ EOF
cat <<EOF > $RELEASE/DEBIAN/conffiles cat <<EOF > $RELEASE/DEBIAN/conffiles
/etc/default/ebusd /etc/default/ebusd
EOF EOF
if [ -d "$RELEASE/etc/ebusd" ]; then if ls $RELEASE/etc/ebusd/* >/dev/null 2>&1 ; then
echo '/etc/ebusd' >> $RELEASE/DEBIAN/dirs echo '/etc/ebusd' >> $RELEASE/DEBIAN/dirs
(cd $RELEASE && for i in etc/ebusd/*; do echo "/$i"; done) >> $RELEASE/DEBIAN/conffiles (cd $RELEASE && for i in etc/ebusd/*; do echo "/$i"; done) >> $RELEASE/DEBIAN/conffiles
fi fi
-3
View File
@@ -37,6 +37,3 @@ endif
distclean-local: distclean-local:
-rm -f Makefile.in -rm -f Makefile.in
-rm -rf .libs -rm -rf .libs
install-data-local:
[ -d $(DESTDIR)$(sysconfdir)/ebusd ] || mkdir -p $(DESTDIR)$(sysconfdir)/ebusd