2019-01-18 Fred Gleason <fredg@paravelsystems.com>

* 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.
4 years ago · 6e45c0b624
8 changed files with 18 additions and 9 deletions
--- 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
--- a/4
+++ b/4
@ -18406,3 +18406,7 @@
 2019-01-17 Fred Gleason <fredg@paravelsystems.com>
 	* Fixed a bug in rdrender(1) that caused corruption when printing
 	UTF-8 characters.
+2019-01-18 Fred Gleason <fredg@paravelsystems.com>
+	* 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.
--- 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()

--- 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
--- a/xdg/rdalsaconfig-root-consolehelper
+++ b/xdg/rdalsaconfig-root-consolehelper
@ -1,3 +0,0 @@
-USER=root
-PROGRAM=/usr/bin/rdalsaconfig
-SESSION=true
--- a/xdg/rdalsaconfig-root-consolehelper.in
+++ b/xdg/rdalsaconfig-root-consolehelper.in
@ -0,0 +1,3 @@
+USER=root
+PROGRAM=@prefix@/bin/rdalsaconfig
+SESSION=true
--- a/xdg/rddbconfig-root-consolehelper
+++ b/xdg/rddbconfig-root-consolehelper
@ -1,3 +0,0 @@
-USER=root
-PROGRAM=/usr/bin/rddbconfig
-SESSION=true
--- a/xdg/rddbconfig-root-consolehelper.in
+++ b/xdg/rddbconfig-root-consolehelper.in
@ -0,0 +1,3 @@
+USER=root
+PROGRAM=@prefix@/bin/rddbconfig
+SESSION=true