25136464 libexecdir incorrectly specified in the consolekit Makefile
authorNiveditha Rau <Niveditha.Rau@Oracle.COM>
Tue, 22 Nov 2016 11:54:38 -0800
changeset 7374 dbcebcd93e38
parent 7373 43fd8b285254
child 7375 b55580983599
25136464 libexecdir incorrectly specified in the consolekit Makefile
components/desktop/consolekit/Makefile
--- a/components/desktop/consolekit/Makefile	Tue Nov 22 12:30:56 2016 -0800
+++ b/components/desktop/consolekit/Makefile	Tue Nov 22 11:54:38 2016 -0800
@@ -54,7 +54,12 @@
 CONFIGURE_OPTIONS +=	--enable-pam-module
 CONFIGURE_OPTIONS.32 +=	--with-pam-module-dir=/usr/lib/security
 CONFIGURE_OPTIONS.64 +=	--with-pam-module-dir=/usr/lib/security/$(MACH64)
-CONFIGURE_OPTIONS +=	--libexecdir="$(USRLIB)"
+# The 32-bit versions of private commands are not packaged as the 64-bit
+# versions must be used instead since they are executed directly by
+# parts of the GNOME system and so must be delivered to the 32-bit
+# location. 
+CONFIGURE_OPTIONS.32 += --libexecdir="$(USRLIBDIR)/$(MACH32)"
+CONFIGURE_OPTIONS.64 += --libexecdir="$(USRLIBDIR)" 
 CONFIGURE_OPTIONS +=	--localstatedir="$(VARDIR)"
 CONFIGURE_OPTIONS +=	--enable-rbac-shutdown=solaris.system.shutdown