Honour GNU standard sysconfdir variable when installing udevil.conf

This commit is contained in:
Omega Weapon 2013-11-10 17:36:59 +00:00
parent 7c5f44d968
commit e357f6cc02
2 changed files with 20 additions and 12 deletions

View File

@ -5,13 +5,17 @@ EXTRA_DIST = udevil.conf
endif
install-data-hook:
test -d $(DESTDIR)/etc/udevil || mkdir -p -- $(DESTDIR)/etc/udevil
test -f $(DESTDIR)/etc/udevil/udevil.conf || $(INSTALL_DATA) \
$(srcdir)/udevil.conf $(DESTDIR)/etc/udevil/udevil.conf
test -d $(DESTDIR)$(sysconfdir)/udevil || mkdir -p -- \
$(DESTDIR)$(sysconfdir)/udevil
test -f $(DESTDIR)$(sysconfdir)/udevil/udevil.conf || $(INSTALL_DATA) \
$(srcdir)/udevil.conf \
$(DESTDIR)$(sysconfdir)/udevil/udevil.conf
if ADD_SYSTEMD
test -d $(DESTDIR)/etc/conf.d || mkdir -p -- $(DESTDIR)/etc/conf.d
test -f $(DESTDIR)/etc/conf.d/devmon || $(INSTALL_DATA) \
$(srcdir)/systemd/devmon $(DESTDIR)/etc/conf.d/devmon
test -d $(DESTDIR)$(sysconfdir)/conf.d || mkdir -p -- \
$(DESTDIR)$(sysconfdir)/conf.d
test -f $(DESTDIR)$(sysconfdir)/conf.d/devmon || $(INSTALL_DATA) \
$(srcdir)/systemd/devmon \
$(DESTDIR)$(sysconfdir)/conf.d/devmon
test -d $(DESTDIR)/$(libdir)/systemd/system || \
mkdir -p -- $(DESTDIR)/$(libdir)/systemd/system
$(INSTALL_DATA) $(srcdir)/systemd/devmon@.service \

View File

@ -457,12 +457,16 @@ uninstall-am:
install-data-hook:
test -d $(DESTDIR)/etc/udevil || mkdir -p -- $(DESTDIR)/etc/udevil
test -f $(DESTDIR)/etc/udevil/udevil.conf || $(INSTALL_DATA) \
$(srcdir)/udevil.conf $(DESTDIR)/etc/udevil/udevil.conf
@ADD_SYSTEMD_TRUE@ test -d $(DESTDIR)/etc/conf.d || mkdir -p -- $(DESTDIR)/etc/conf.d
@ADD_SYSTEMD_TRUE@ test -f $(DESTDIR)/etc/conf.d/devmon || $(INSTALL_DATA) \
@ADD_SYSTEMD_TRUE@ $(srcdir)/systemd/devmon $(DESTDIR)/etc/conf.d/devmon
test -d $(DESTDIR)$(sysconfdir)/udevil || mkdir -p -- \
$(DESTDIR)$(sysconfdir)/udevil
test -f $(DESTDIR)$(sysconfdir)/udevil/udevil.conf || $(INSTALL_DATA) \
$(srcdir)/udevil.conf \
$(DESTDIR)$(sysconfdir)/udevil/udevil.conf
@ADD_SYSTEMD_TRUE@ test -d $(DESTDIR)$(sysconfdir)/conf.d || mkdir -p -- \
@ADD_SYSTEMD_TRUE@ $(DESTDIR)$(sysconfdir)/conf.d
@ADD_SYSTEMD_TRUE@ test -f $(DESTDIR)$(sysconfdir)/conf.d/devmon || $(INSTALL_DATA) \
@ADD_SYSTEMD_TRUE@ $(srcdir)/systemd/devmon \
@ADD_SYSTEMD_TRUE@ $(DESTDIR)$(sysconfdir)/conf.d/devmon
@ADD_SYSTEMD_TRUE@ test -d $(DESTDIR)/$(libdir)/systemd/system || \
@ADD_SYSTEMD_TRUE@ mkdir -p -- $(DESTDIR)/$(libdir)/systemd/system
@ADD_SYSTEMD_TRUE@ $(INSTALL_DATA) $(srcdir)/systemd/devmon@.service \