From ab83d5a051a20bbd20da40b25086854cb56caf43 Mon Sep 17 00:00:00 2001
From: Sanel Zukan <karijes@users.sf.net>
Date: Tue, 24 Feb 2009 13:54:14 +0000
Subject: [PATCH] Let tips be installed

---
 Jamconfig.in      | 11 +++++++++--
 build/Install.jam |  6 ++++++
 ede-tip/Jamfile   |  5 ++++-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/Jamconfig.in b/Jamconfig.in
index 97474c6..8004a51 100644
--- a/Jamconfig.in
+++ b/Jamconfig.in
@@ -38,17 +38,24 @@ EDE_VERSION ?= "@EDE_VERSION@" ;
 # directories used by build system
 PREFIX               ?= "$(prefix)" ;
 EDE_BIN_DIR          ?= "$(bindir)" ;
-EDE_CONFIG_DIR       ?= "$(datadir)/config" ;
+EDE_CONFIG_DIR       ?= "/etc/xdg/ede" ; # use XDG default for config dir
+EDE_CONFIG_DIR_OLD   ?= "$(datadir)/config" ;
 EDE_ICON_DIR         ?= "$(datadir)/icons" ;
 EDE_DESKTOP_FILE_DIR ?= "$(datadir)/desktop" ;
 EDE_MIME_DIR         ?= "$(datadir)/mime" ;
 EDE_DOC_DIR          ?= "$(docdir)/ede-$(EDE_VERSION)" ;
+EDE_THEMES_DIR       ?= "$(datadir)/themes" ;
+EDE_TIPS_DIR         ?= "$(datadir)/tips" ;
 
 OPTIMFLAGS ?= @EDE_OPTIM_FLAGS@ ;
 DEBUGFLAGS ?= @EDE_DEBUG_FLAGS@ ;
 
+# some C libraries have issues with C++ when given '-pedantic' flag, so
+# setting 'jam -sPEDANTIC=""' will allow compilation
+PEDANTIC = "-pedantic" ;
+
 # global flags used to be passed to every target
-GLOBALFLAGS  ?= -Wall -pedantic -DHAVE_CONFIG_H -I$(TOP) $(OPTIMFLAGS) $(DEBUGFLAGS) ;
+GLOBALFLAGS  ?= -Wall $(PEDANTIC) -DHAVE_CONFIG_H -I$(TOP) $(OPTIMFLAGS) $(DEBUGFLAGS) ;
 STDLIB       ?= -lstdc++ ;
 
 # Note that REMOVE_UNUSED_DEPENDENCIES_TRICK _does not_ works when
diff --git a/build/Install.jam b/build/Install.jam
index a0440e9..a2c0e29 100644
--- a/build/Install.jam
+++ b/build/Install.jam
@@ -115,6 +115,12 @@ rule InstallEdeConfigFiles
 	InstallData $(EDE_CONFIG_DIR) : $(<) ;
 }
 
+# InstallEdeTips [targets] ;
+rule InstallEdeTips
+{
+	InstallData $(EDE_TIPS_DIR) : $(<) ;
+}
+
 # InstallEdeMimeFiles [targets] ;
 # Installs XDG mime files and run update-mime-database
 rule InstallEdeMimeFiles
diff --git a/ede-tip/Jamfile b/ede-tip/Jamfile
index 878fc4a..bbca3b9 100644
--- a/ede-tip/Jamfile
+++ b/ede-tip/Jamfile
@@ -37,4 +37,7 @@ actions FortuneCompile1
 	$(TOP)/ede-tip/ede-tip-compiler -s "$(>)" "$(<)"
 }
 
-FortuneCompile tips/ede.dat      : tips/ede ;
+FortuneCompile tips/ede.dat : tips/ede ;
+
+InstallEdeTips tips/ede.dat ;
+InstallEdeTips tips/ede ;