From 12174af67da17976474fd3d8b8e9f5be4c265182 Mon Sep 17 00:00:00 2001
From: Sanel Zukan <karijes@users.sf.net>
Date: Thu, 4 Sep 2008 10:16:55 +0000
Subject: [PATCH] Update paths

---
 Jamfile                  | 4 ++--
 build/Doc.jam            | 6 +++---
 data/Jamfile             | 6 +++---
 data/icon-themes/Jamfile | 2 +-
 data/mime-types/Jamfile  | 2 +-
 doc/Jamfile              | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Jamfile b/Jamfile
index d45c29a..efc80fc 100644
--- a/Jamfile
+++ b/Jamfile
@@ -30,6 +30,6 @@ SubInclude TOP emountd ;
 SubInclude TOP etimedate ;
 SubInclude TOP etip ;
 SubInclude TOP evoke ;
-SubInclude TOP docs ;
-SubInclude TOP datas ;
+SubInclude TOP doc ;
+SubInclude TOP data ;
 SubInclude TOP tools ;
diff --git a/build/Doc.jam b/build/Doc.jam
index 6a785f7..636c92a 100644
--- a/build/Doc.jam
+++ b/build/Doc.jam
@@ -8,11 +8,11 @@
 # GNU General Public License version 2 or newer.
 # See COPYING for details.
 
-ASCIIDOC  = "$(TOP)/docs/asciidoc/asciidoc.py" ;
-DOCDIR    = "$(TOP)/docs" ;
+ASCIIDOC  = "$(TOP)/doc/asciidoc/asciidoc.py" ;
+DOCDIR    = "$(TOP)/doc" ;
 MANUALDIR = "$(DOCDIR)/manual" ;
 
-# Must be relative to "docs" dir
+# Must be relative to "doc" dir
 MANUALICONS = "images" ;
 
 # EdeManual [file] : [optinal-images] : "make-toc" ;
diff --git a/data/Jamfile b/data/Jamfile
index ee546a4..a171363 100644
--- a/data/Jamfile
+++ b/data/Jamfile
@@ -8,7 +8,7 @@
 # GNU General Public License version 2 or newer.
 # See COPYING for details.
 
-SubDir TOP datas ;
+SubDir TOP data ;
 
 ICONS48 = [ Wildcard icons-48 : *.png : icons-48 ] ;
 ICONS16 = [ Wildcard icons-16 : *.png : icons-16 ] ;
@@ -21,5 +21,5 @@ InstallEdeIcons icons-48 : $(ICONS48) ;
 InstallEdeConfigFiles  $(CONFS) ;
 InstallEdeDesktopFiles $(PLINKS) ;
 
-SubInclude TOP datas mime-types ;
-SubInclude TOP datas icon-themes ;
+SubInclude TOP data mime-types ;
+SubInclude TOP data icon-themes ;
diff --git a/data/icon-themes/Jamfile b/data/icon-themes/Jamfile
index fde4d41..c527642 100644
--- a/data/icon-themes/Jamfile
+++ b/data/icon-themes/Jamfile
@@ -8,7 +8,7 @@
 # GNU General Public License version 2 or newer.
 # See COPYING for details.
 
-SubDir TOP datas icon-themes ;
+SubDir TOP data icon-themes ;
 
 # ConvertIconTheme [icon-theme-name] : [icon-sizes] : [icon-categories] ;
 # Mass conversion of scalable (.svg) icon theme to .png one. Make sure directory
diff --git a/data/mime-types/Jamfile b/data/mime-types/Jamfile
index d13ad6d..b359e0d 100644
--- a/data/mime-types/Jamfile
+++ b/data/mime-types/Jamfile
@@ -8,6 +8,6 @@
 # GNU General Public License version 2 or newer.
 # See COPYING for details.
 
-SubDir TOP datas mime-types ;
+SubDir TOP data mime-types ;
 
 InstallEdeMimeFiles x-fluid.xml ;
diff --git a/doc/Jamfile b/doc/Jamfile
index 09a8b4b..5efcd49 100644
--- a/doc/Jamfile
+++ b/doc/Jamfile
@@ -8,7 +8,7 @@
 # GNU General Public License version 2 or newer.
 # See COPYING for details.
 
-SubDir TOP docs ;
+SubDir TOP doc ;
 
 EdeManual index.txt introduction.txt jambuild.txt ;
 EdeManualWithToc dbus-usage.txt ;