From fcf71678b0a9c452566496f07ad17e84181342a6 Mon Sep 17 00:00:00 2001
From: Sanel Zukan <karijes@users.sf.net>
Date: Mon, 18 Jan 2010 14:38:22 +0000
Subject: [PATCH] Dumped builtin paths as distros can't use them for packaging.
 Noted by Thierry from NuTyX project.

---
 Jamconfig.in | 18 +++++++++++++-----
 configure.in |  4 ----
 data/Jamfile |  2 +-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/Jamconfig.in b/Jamconfig.in
index d814fcc..1059697 100644
--- a/Jamconfig.in
+++ b/Jamconfig.in
@@ -19,7 +19,14 @@ includedir  ?= "@includedir@" ;
 libdir      ?= "@libdir@" ;
 mandir      ?= "@mandir@" ;
 srcdir      ?= "@abs_srcdir@" ;
-sysconfdir  ?= "@sysconfdir@" ;
+
+# by default, configure will use '$(prefix)/etc' for sysconfdir which is pretty dumb
+# as (by default) things installed in '/usr' put config data in '/etc'
+if $(prefix) = "/" || $(prefix) = "/usr" {
+	sysconfdir ?= "/etc" ;
+} else {
+	sysconfdir ?= "@sysconfdir@" ;
+}
 
 # compiler
 CC           = @CC@ ;
@@ -48,8 +55,8 @@ EDE_PREFIX_SUBDIR ?= "ede" ;
 PREFIX                ?= "$(prefix)" ;
 EDE_BIN_DIR           ?= "$(bindir)" ;
 EDE_DATA_DIR          ?= "$(datadir)" ;
-EDE_CONFIG_DIR        ?= "/etc/xdg/$(EDE_PREFIX_SUBDIR)" ;
-EDE_MENU_DIR          ?= "/etc/xdg/menus" ; # use XDG default for menu dir
+EDE_CONFIG_DIR        ?= "$(sysconfdir)/xdg/$(EDE_PREFIX_SUBDIR)" ;
+EDE_MENU_DIR          ?= "$(sysconfdir)/xdg/menus" ; # use XDG default for menu dir
 EDE_ICON_DIR          ?= "$(EDE_DATA_DIR)/icons" ;
 EDE_MIME_DIR          ?= "$(EDE_DATA_DIR)/mime" ; # use XDG mime path
 EDE_DOC_DIR           ?= "$(docdir)/ede-$(EDE_VERSION)" ;
@@ -57,6 +64,9 @@ EDE_THEMES_DIR        ?= "$(EDE_DATA_DIR)/$(EDE_PREFIX_SUBDIR)/themes" ;
 EDE_TIPS_DIR          ?= "$(EDE_DATA_DIR)/$(EDE_PREFIX_SUBDIR)/tips" ;
 EDE_PANEL_APPLETS_DIR ?= "$(EDE_DATA_DIR)/$(EDE_PREFIX_SUBDIR)/panel-applets" ;
 
+DBUS_SERVICE_DIR      ?= "$(datarootdir)/dbus-1/services" ;
+XSESSIONS_DIR         ?= "$(datarootdir)/xsessions" ;
+
 OPTIMFLAGS     ?= @EDE_OPTIM_FLAGS@ ;
 DEBUGFLAGS     ?= @EDE_DEBUG_FLAGS@ ;
 LARGEFILEFLAGS ?= @LARGEFILE@ ;
@@ -137,7 +147,5 @@ if $(SUN_COMPILER) {
 	PTHREAD_LIBS   ?= @PTHREAD_LIBS@ ;
 }
 
-DBUS_SERVICE_DIR ?= @DBUS_SERVICE_DIR@ ;
-
 # do not touch this
 JAMCONFIG_READ = "yes" ;
diff --git a/configure.in b/configure.in
index 35197a6..042e6cf 100644
--- a/configure.in
+++ b/configure.in
@@ -242,10 +242,6 @@ else
 	AC_MSG_RESULT(no)
 fi
 
-EDE_CHECK_DIR(DBUS_SERVICE_DIR, 
-			  [/usr/share/dbus-1/services /usr/local/share/dbus-1/services "$datarootdir/dbus-1/services"])
-
-
 EDE_INIT_JAM
 
 AC_SUBST(EDE_VERSION)
diff --git a/data/Jamfile b/data/Jamfile
index 7303acd..dd7ef33 100644
--- a/data/Jamfile
+++ b/data/Jamfile
@@ -16,7 +16,7 @@ InstallEdeProgram      startede ;
 InstallEdeConfigFiles  $(CONFS) ;
 
 # install entry for login/desktop managers
-InstallData /usr/share/xsessions : ede.desktop ;
+InstallData $(XSESSIONS_DIR) : ede.desktop ;
 Clean distclean : ede.desktop ;
 
 SubInclude TOP data mime-types ;