diff --git a/.gitignore b/.gitignore index ac84f6eb..e5a91355 100644 --- a/.gitignore +++ b/.gitignore @@ -155,5 +155,7 @@ utils/rdselect_helper/rdprofile.h utils/rdselect_helper/rdselect_helper utils/sas_shim/sas_shim web/rdfeed/rdfeed.xml +xdg/rdalsaconfig-root-consolehelper +xdg/rddbconfig-root-consolehelper xdg/rivendell-opsguide-html.desktop xdg/rivendell-opsguide-pdf.desktop diff --git a/ChangeLog b/ChangeLog index 93685fa3..a4e328dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18406,3 +18406,7 @@ 2019-01-17 Fred Gleason * Fixed a bug in rdrender(1) that caused corruption when printing UTF-8 characters. +2019-01-18 Fred Gleason + * Fixed a path bug in the Console Helper configuration that broke + startup of rdalsaconfig(8) and rddbconfig(8) from the desktop + menu when using default --prefix= value. diff --git a/configure.ac b/configure.ac index 6059279d..70e1cd7c 100644 --- a/configure.ac +++ b/configure.ac @@ -551,6 +551,8 @@ AC_CONFIG_FILES([rivendell.spec \ utils/rmlsend/Makefile \ utils/sas_shim/Makefile \ xdg/Makefile \ + xdg/rdalsaconfig-root-consolehelper \ + xdg/rddbconfig-root-consolehelper \ ]) AC_OUTPUT() diff --git a/xdg/Makefile.am b/xdg/Makefile.am index 37bd1288..8f564b91 100644 --- a/xdg/Makefile.am +++ b/xdg/Makefile.am @@ -67,9 +67,9 @@ uninstall-local: rm -f $(DESTDIR)/etc/security/console.apps/rddbconfig-root rm -f $(DESTDIR)$(prefix)/bin/rddbconfig-root -EXTRA_DIST = rdalsaconfig-root-consolehelper\ +EXTRA_DIST = rdalsaconfig-root-consolehelper.in\ rdalsaconfig-root-pam\ - rddbconfig-root-consolehelper\ + rddbconfig-root-consolehelper.in\ rddbconfig-root-pam\ rivendell-configuration.directory\ rivendell-documentation.directory\ @@ -99,6 +99,7 @@ EXTRA_DIST = rdalsaconfig-root-consolehelper\ rivendell-utilities.directory CLEANFILES = *~ - +DISTCLEANFILES = rdalsaconfig-root-consolehelper\ + rddbconfig-root-consolehelper MAINTAINERCLEANFILES = *~\ Makefile.in diff --git a/xdg/rdalsaconfig-root-consolehelper b/xdg/rdalsaconfig-root-consolehelper deleted file mode 100644 index b7ec8ebe..00000000 --- a/xdg/rdalsaconfig-root-consolehelper +++ /dev/null @@ -1,3 +0,0 @@ -USER=root -PROGRAM=/usr/bin/rdalsaconfig -SESSION=true diff --git a/xdg/rdalsaconfig-root-consolehelper.in b/xdg/rdalsaconfig-root-consolehelper.in new file mode 100644 index 00000000..1bdf6fd1 --- /dev/null +++ b/xdg/rdalsaconfig-root-consolehelper.in @@ -0,0 +1,3 @@ +USER=root +PROGRAM=@prefix@/bin/rdalsaconfig +SESSION=true diff --git a/xdg/rddbconfig-root-consolehelper b/xdg/rddbconfig-root-consolehelper deleted file mode 100644 index 27bc80f6..00000000 --- a/xdg/rddbconfig-root-consolehelper +++ /dev/null @@ -1,3 +0,0 @@ -USER=root -PROGRAM=/usr/bin/rddbconfig -SESSION=true diff --git a/xdg/rddbconfig-root-consolehelper.in b/xdg/rddbconfig-root-consolehelper.in new file mode 100644 index 00000000..30bba849 --- /dev/null +++ b/xdg/rddbconfig-root-consolehelper.in @@ -0,0 +1,3 @@ +USER=root +PROGRAM=@prefix@/bin/rddbconfig +SESSION=true