From c854d9272dc2285aaa919f29c2985b315e9598ec Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Mon, 8 Jan 2007 18:19:22 +0100 Subject: [PATCH] Fix makefiles --- services/console/Makefile.am | 2 +- services/console/interface/logviewer/Makefile.am | 2 +- services/console/interface/memphis/Makefile.am | 2 +- services/console/interface/memphis/plugins/Makefile.am | 2 +- .../console/interface/memphis/plugins/clean_size/Makefile.am | 2 +- services/console/interface/memphis/plugins/cpu/Makefile.am | 2 +- .../console/interface/memphis/plugins/dirty_size/Makefile.am | 2 +- .../console/interface/memphis/plugins/memphis_init/Makefile.am | 2 +- services/console/interface/terminal/Makefile.am | 2 +- services/console/interface/xo/Makefile.am | 2 +- services/console/lib/procmem/Makefile.am | 2 +- services/console/org.laptop.sugar.Console.service.in | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/services/console/Makefile.am b/services/console/Makefile.am index fe6aee08..4994b9f3 100644 --- a/services/console/Makefile.am +++ b/services/console/Makefile.am @@ -7,7 +7,7 @@ service_DATA = $(service_in_files:.service.in=.service) $(service_DATA): $(service_in_files) Makefile @sed -e "s|\@bindir\@|$(bindir)|" $< > $@ -sugardir = $(pkgdatadir)/shell/console +sugardir = $(pkgdatadir)/services/console sugar_PYTHON = \ __init__.py \ console.py diff --git a/services/console/interface/logviewer/Makefile.am b/services/console/interface/logviewer/Makefile.am index e6a69796..9194684f 100644 --- a/services/console/interface/logviewer/Makefile.am +++ b/services/console/interface/logviewer/Makefile.am @@ -1,4 +1,4 @@ -sugardir = $(pkgdatadir)/shell/console/interface/logviewer +sugardir = $(pkgdatadir)/services/console/interface/logviewer sugar_PYTHON = \ __init__.py \ logviewer.py diff --git a/services/console/interface/memphis/Makefile.am b/services/console/interface/memphis/Makefile.am index 319dad68..4d4de4e7 100644 --- a/services/console/interface/memphis/Makefile.am +++ b/services/console/interface/memphis/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = plugins -sugardir = $(pkgdatadir)/shell/console/interface/memphis +sugardir = $(pkgdatadir)/services/console/interface/memphis sugar_PYTHON = \ __init__.py \ memphis.py \ diff --git a/services/console/interface/memphis/plugins/Makefile.am b/services/console/interface/memphis/plugins/Makefile.am index 2c6b1ddf..a18eafe7 100644 --- a/services/console/interface/memphis/plugins/Makefile.am +++ b/services/console/interface/memphis/plugins/Makefile.am @@ -1,4 +1,4 @@ SUBDIRS = clean_size cpu dirty_size memphis_init -sugardir = $(pkgdatadir)/shell/console/interface/memphis/plugins +sugardir = $(pkgdatadir)/services/console/interface/memphis/plugins sugar_PYTHON = diff --git a/services/console/interface/memphis/plugins/clean_size/Makefile.am b/services/console/interface/memphis/plugins/clean_size/Makefile.am index 33565f5c..aa4ea115 100644 --- a/services/console/interface/memphis/plugins/clean_size/Makefile.am +++ b/services/console/interface/memphis/plugins/clean_size/Makefile.am @@ -1,5 +1,5 @@ -sugardir = $(pkgdatadir)/shell/console/interface/memphis/plugins/clean_size +sugardir = $(pkgdatadir)/services/console/interface/memphis/plugins/clean_size sugar_PYTHON = \ README \ __init__.py \ diff --git a/services/console/interface/memphis/plugins/cpu/Makefile.am b/services/console/interface/memphis/plugins/cpu/Makefile.am index 58e9eab5..c8b8584b 100644 --- a/services/console/interface/memphis/plugins/cpu/Makefile.am +++ b/services/console/interface/memphis/plugins/cpu/Makefile.am @@ -1,5 +1,5 @@ -sugardir = $(pkgdatadir)/shell/console/interface/memphis/plugins/cpu +sugardir = $(pkgdatadir)/services/console/interface/memphis/plugins/cpu sugar_PYTHON = \ README \ __init__.py \ diff --git a/services/console/interface/memphis/plugins/dirty_size/Makefile.am b/services/console/interface/memphis/plugins/dirty_size/Makefile.am index 47c52983..1f81dfbb 100644 --- a/services/console/interface/memphis/plugins/dirty_size/Makefile.am +++ b/services/console/interface/memphis/plugins/dirty_size/Makefile.am @@ -1,5 +1,5 @@ -sugardir = $(pkgdatadir)/shell/console/interface/memphis/plugins/dirty_size +sugardir = $(pkgdatadir)/services/console/interface/memphis/plugins/dirty_size sugar_PYTHON = \ README \ __init__.py \ diff --git a/services/console/interface/memphis/plugins/memphis_init/Makefile.am b/services/console/interface/memphis/plugins/memphis_init/Makefile.am index 53b398a5..3b2035d3 100644 --- a/services/console/interface/memphis/plugins/memphis_init/Makefile.am +++ b/services/console/interface/memphis/plugins/memphis_init/Makefile.am @@ -1,5 +1,5 @@ -sugardir = $(pkgdatadir)/shell/console/interface/memphis/plugins/memphis_init +sugardir = $(pkgdatadir)/services/console/interface/memphis/plugins/memphis_init sugar_PYTHON = \ README \ __init__.py \ diff --git a/services/console/interface/terminal/Makefile.am b/services/console/interface/terminal/Makefile.am index 8df46508..f92a4d60 100644 --- a/services/console/interface/terminal/Makefile.am +++ b/services/console/interface/terminal/Makefile.am @@ -1,4 +1,4 @@ -sugardir = $(pkgdatadir)/shell/console/interface/terminal +sugardir = $(pkgdatadir)/services/console/interface/terminal sugar_PYTHON = \ __init__.py \ terminal.py diff --git a/services/console/interface/xo/Makefile.am b/services/console/interface/xo/Makefile.am index b2035dda..f4af6d34 100644 --- a/services/console/interface/xo/Makefile.am +++ b/services/console/interface/xo/Makefile.am @@ -1,4 +1,4 @@ -sugardir = $(pkgdatadir)/shell/console/interface/xo +sugardir = $(pkgdatadir)/services/console/interface/xo sugar_PYTHON = \ __init__.py \ drwarea.py \ diff --git a/services/console/lib/procmem/Makefile.am b/services/console/lib/procmem/Makefile.am index 257c13fa..bdbe6d18 100644 --- a/services/console/lib/procmem/Makefile.am +++ b/services/console/lib/procmem/Makefile.am @@ -1,5 +1,5 @@ -sugardir = $(pkgdatadir)/shell/console/lib/procmem +sugardir = $(pkgdatadir)/services/console/lib/procmem sugar_PYTHON = \ __init__.py \ diff --git a/services/console/org.laptop.sugar.Console.service.in b/services/console/org.laptop.sugar.Console.service.in index 90882fe8..48206709 100644 --- a/services/console/org.laptop.sugar.Console.service.in +++ b/services/console/org.laptop.sugar.Console.service.in @@ -1,4 +1,4 @@ [D-BUS Service] -Name = org.laptop.Console +Name = org.laptop.sugar.Console Exec = @bindir@/sugar-console