From 4d103208568a4911a5dbd94d05ce9523f1c09ece Mon Sep 17 00:00:00 2001
From: Sanel Zukan <karijes@users.sf.net>
Date: Sat, 3 Oct 2009 07:49:30 +0000
Subject: [PATCH] Updated paths

---
 ede-panel/Jamfile                      |  6 +++---
 ede-panel/applets/Jamfile              | 14 +++++++-------
 ede-panel/applets/clock/Jamfile        |  2 +-
 ede-panel/applets/demo/Jamfile         |  2 +-
 ede-panel/applets/pager/Jamfile        |  2 +-
 ede-panel/applets/quick-launch/Jamfile |  2 +-
 ede-panel/applets/start-menu/Jamfile   |  2 +-
 ede-panel/applets/taskbar/Jamfile      |  2 +-
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/ede-panel/Jamfile b/ede-panel/Jamfile
index ba597db..b037fe5 100644
--- a/ede-panel/Jamfile
+++ b/ede-panel/Jamfile
@@ -8,7 +8,7 @@
 # GNU General Public License version 2 or newer.
 # See COPYING for details.
 
-SubDir TOP ede-panel-new ;
+SubDir TOP ede-panel ;
 
 # make it as library, so applets can use it too
 ObjectC++Flags Netwm.cpp : -g3 -fPIC  $(EDELIBINCLUDE) ;
@@ -29,7 +29,7 @@ rule PanelApplet
 	target = $(<:S=$(SUFLIB_SHARED)) ;
 
 	Main $(target) : $(>) ;
-	ObjectC++Flags $(>) : -fPIC -I [ FDirName $(TOP) ede-panel-new ] $(EDELIBINCLUDE) ;
+	ObjectC++Flags $(>) : -fPIC -I [ FDirName $(TOP) ede-panel ] $(EDELIBINCLUDE) ;
 
 	LinkAgainst $(target) : $(NETWMLIB) $(EDELIBLIB) $(EDELIB_GUI_LIB) $(FLTKLIB) $(STDLIB) ;
 	LINKFLAGS on $(target) = -shared -rdynamic [ on $(target) return $(LINKFLAGS) ] ;
@@ -40,4 +40,4 @@ rule PanelApplet
 	Clean clean : $(target) ;
 }
 
-SubInclude TOP ede-panel-new applets ;
+SubInclude TOP ede-panel applets ;
diff --git a/ede-panel/applets/Jamfile b/ede-panel/applets/Jamfile
index 883ab8c..45fa5f6 100644
--- a/ede-panel/applets/Jamfile
+++ b/ede-panel/applets/Jamfile
@@ -8,11 +8,11 @@
 # GNU General Public License version 2 or newer.
 # See COPYING for details.
 
-SubDir TOP ede-panel-new applets ;
+SubDir TOP ede-panel applets ;
 
-SubInclude TOP ede-panel-new applets demo ;
-SubInclude TOP ede-panel-new applets clock ;
-SubInclude TOP ede-panel-new applets pager ;
-SubInclude TOP ede-panel-new applets quick-launch ;
-SubInclude TOP ede-panel-new applets start-menu ;
-SubInclude TOP ede-panel-new applets taskbar ;
+SubInclude TOP ede-panel applets demo ;
+SubInclude TOP ede-panel applets clock ;
+SubInclude TOP ede-panel applets pager ;
+SubInclude TOP ede-panel applets quick-launch ;
+SubInclude TOP ede-panel applets start-menu ;
+SubInclude TOP ede-panel applets taskbar ;
diff --git a/ede-panel/applets/clock/Jamfile b/ede-panel/applets/clock/Jamfile
index b22ed29..88eaa2c 100644
--- a/ede-panel/applets/clock/Jamfile
+++ b/ede-panel/applets/clock/Jamfile
@@ -8,6 +8,6 @@
 # GNU General Public License version 2 or newer.
 # See COPYING for details.
 
-SubDir TOP ede-panel-new applets clock ;
+SubDir TOP ede-panel applets clock ;
 
 PanelApplet clock : Clock.cpp ;
diff --git a/ede-panel/applets/demo/Jamfile b/ede-panel/applets/demo/Jamfile
index c6b6475..328ed23 100644
--- a/ede-panel/applets/demo/Jamfile
+++ b/ede-panel/applets/demo/Jamfile
@@ -8,6 +8,6 @@
 # GNU General Public License version 2 or newer.
 # See COPYING for details.
 
-SubDir TOP ede-panel-new applets demo ;
+SubDir TOP ede-panel applets demo ;
 
 PanelApplet demo : AppletDemo.cpp ;
diff --git a/ede-panel/applets/pager/Jamfile b/ede-panel/applets/pager/Jamfile
index 23c02d1..2ee399e 100644
--- a/ede-panel/applets/pager/Jamfile
+++ b/ede-panel/applets/pager/Jamfile
@@ -8,6 +8,6 @@
 # GNU General Public License version 2 or newer.
 # See COPYING for details.
 
-SubDir TOP ede-panel-new applets pager ;
+SubDir TOP ede-panel applets pager ;
 
 PanelApplet pager : Pager.cpp PagerButton.cpp ;
diff --git a/ede-panel/applets/quick-launch/Jamfile b/ede-panel/applets/quick-launch/Jamfile
index 9866221..1bb6e4e 100644
--- a/ede-panel/applets/quick-launch/Jamfile
+++ b/ede-panel/applets/quick-launch/Jamfile
@@ -8,6 +8,6 @@
 # GNU General Public License version 2 or newer.
 # See COPYING for details.
 
-SubDir TOP ede-panel-new applets quick-launch ;
+SubDir TOP ede-panel applets quick-launch ;
 
 PanelApplet quick_launch : QuickLaunch.cpp ;
diff --git a/ede-panel/applets/start-menu/Jamfile b/ede-panel/applets/start-menu/Jamfile
index 974bd64..3639b79 100644
--- a/ede-panel/applets/start-menu/Jamfile
+++ b/ede-panel/applets/start-menu/Jamfile
@@ -8,7 +8,7 @@
 # GNU General Public License version 2 or newer.
 # See COPYING for details.
 
-SubDir TOP ede-panel-new applets start-menu ;
+SubDir TOP ede-panel applets start-menu ;
 
 MENU_SRC = XdgMenuReader.cpp DesktopEntry.cpp MenuRules.cpp ;
 
diff --git a/ede-panel/applets/taskbar/Jamfile b/ede-panel/applets/taskbar/Jamfile
index 777d8e6..9e01954 100644
--- a/ede-panel/applets/taskbar/Jamfile
+++ b/ede-panel/applets/taskbar/Jamfile
@@ -8,6 +8,6 @@
 # GNU General Public License version 2 or newer.
 # See COPYING for details.
 
-SubDir TOP ede-panel-new applets taskbar ;
+SubDir TOP ede-panel applets taskbar ;
 
 PanelApplet taskbar : TaskButton.cpp Taskbar.cpp ;