Change the installation path for multi-user environment.

configuration files will be installed in the path "/usr/share/enlightenment/config/".
and that files as a default environment for e17 are copied to each user's HOME dir on first boot.

Original Author: MinJeong Kim <minjjj.kim@samsung.com>

Change-Id: I66ea2e38d335f5f767d2cf8315fdf97d9c3bed30

diff --git a/arm/Makefile.am b/arm/Makefile.am
index d56b1df..5cccec4 100644 (file)
--- a/arm/Makefile.am
+++ b/arm/Makefile.am
@@ -1,2 +1,2 @@
 MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = opt 
+SUBDIRS = usr

diff --git a/arm/opt/Makefile.am b/arm/usr/Makefile.am
similarity index 68%
rename from arm/opt/Makefile.am
rename to arm/usr/Makefile.am
index 5a62302..bdb5f9d 100644 (file)
--- a/arm/opt/Makefile.am
+++ b/arm/usr/Makefile.am
@@ -1,2 +1,2 @@
 MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = home
+SUBDIRS = share

diff --git a/arm/usr/share/Makefile.am b/arm/usr/share/Makefile.am
new file mode 100644 (file)
index 0000000..62abf46
--- /dev/null
+++ b/arm/usr/share/Makefile.am
@@ -0,0 +1,2 @@
+MAINTAINERCLEANFILES = Makefile.in
+SUBDIRS = enlightenment

diff --git a/i386/opt/home/app/.e/e/Makefile.am b/arm/usr/share/enlightenment/Makefile.am
similarity index 100%
rename from i386/opt/home/app/.e/e/Makefile.am
rename to arm/usr/share/enlightenment/Makefile.am

diff --git a/i386/opt/home/app/.e/Makefile.am b/arm/usr/share/enlightenment/config/Makefile.am
similarity index 100%
rename from i386/opt/home/app/.e/Makefile.am
rename to arm/usr/share/enlightenment/config/Makefile.am

diff --git a/i386/opt/home/app/.e/apps/launcher/config.eet b/arm/usr/share/enlightenment/config/apps/launcher/config.eet
similarity index 100%
rename from i386/opt/home/app/.e/apps/launcher/config.eet
rename to arm/usr/share/enlightenment/config/apps/launcher/config.eet

diff --git a/emulator/opt/home/app/.e/e/Makefile.am b/arm/usr/share/enlightenment/config/e/Makefile.am
similarity index 100%
rename from emulator/opt/home/app/.e/e/Makefile.am
rename to arm/usr/share/enlightenment/config/e/Makefile.am

diff --git a/i386/opt/home/app/.e/e/applications/startup/.order b/arm/usr/share/enlightenment/config/e/applications/bar/default/.order
similarity index 100%
rename from i386/opt/home/app/.e/e/applications/startup/.order
rename to arm/usr/share/enlightenment/config/e/applications/bar/default/.order

diff --git a/i386/opt/home/app/.e/e/applications/bar/default/.order b/arm/usr/share/enlightenment/config/e/applications/startup/.order
similarity index 100%
rename from i386/opt/home/app/.e/e/applications/bar/default/.order
rename to arm/usr/share/enlightenment/config/e/applications/startup/.order

diff --git a/i386/opt/home/app/.e/e/backgrounds/DM_Wallpaper03.edj b/arm/usr/share/enlightenment/config/e/backgrounds/DM_Wallpaper03.edj
similarity index 100%
rename from i386/opt/home/app/.e/e/backgrounds/DM_Wallpaper03.edj
rename to arm/usr/share/enlightenment/config/e/backgrounds/DM_Wallpaper03.edj

diff --git a/arm/opt/home/app/.e/e/config/Makefile.am b/arm/usr/share/enlightenment/config/e/config/Makefile.am
similarity index 65%
rename from arm/opt/home/app/.e/e/config/Makefile.am
rename to arm/usr/share/enlightenment/config/e/config/Makefile.am
index 91a5fe7..895f5f0 100644 (file)
--- a/arm/opt/home/app/.e/e/config/Makefile.am
+++ b/arm/usr/share/enlightenment/config/e/config/Makefile.am
@@ -5,7 +5,7 @@ EET_EET = @eet_eet@
 
 EXTRA_DIST = profile.src
 
-filesdir = $(prefix)/.e/e/config/
+filesdir = $(prefix)/config/e/config/
 
 files_DATA = profile.cfg
 
@@ -13,7 +13,7 @@ SUFFIXES = .cfg
 
 .src.cfg:
        $(EET_EET) -i \
-       $(top_builddir)/arm/opt/home/app/.e/e/config/$@ config \
+       $(top_builddir)/arm/usr/share/enlightenment/config/e/config/$@ config \
        $< 0
 
 clean-local:

diff --git a/i386/opt/home/app/.e/e/config/profile.src b/arm/usr/share/enlightenment/config/e/config/profile.src
similarity index 100%
rename from i386/opt/home/app/.e/e/config/profile.src
rename to arm/usr/share/enlightenment/config/e/config/profile.src

diff --git a/arm/opt/home/app/.e/e/config/samsung/Makefile.am b/arm/usr/share/enlightenment/config/e/config/samsung/Makefile.am
similarity index 83%
rename from arm/opt/home/app/.e/e/config/samsung/Makefile.am
rename to arm/usr/share/enlightenment/config/e/config/samsung/Makefile.am
index 11a1140..2afabdc 100644 (file)
--- a/arm/opt/home/app/.e/e/config/samsung/Makefile.am
+++ b/arm/usr/share/enlightenment/config/e/config/samsung/Makefile.am
@@ -11,7 +11,7 @@ EXTRA_DIST = \
          module.screen-reader-tizen.src \
          exehist.src
 
-filesdir = $(prefix)/.e/e/config/samsung/
+filesdir = $(prefix)/config/e/config/samsung/
 files_DATA = \
              module.comp-tizen.cfg \
              e.cfg \
@@ -25,7 +25,7 @@ SUFFIXES = .cfg
 
 .src.cfg:
        $(EET_EET) -e \
-       $(top_builddir)/arm/opt/home/app/.e/e/config/samsung/$@ config \
+       $(top_builddir)/arm/usr/share/enlightenment/config/e/config/samsung/$@ config \
        $< 1
 
 clean-local:

diff --git a/arm/opt/home/app/.e/e/config/samsung/e.src b/arm/usr/share/enlightenment/config/e/config/samsung/e.src
similarity index 99%
rename from arm/opt/home/app/.e/e/config/samsung/e.src
rename to arm/usr/share/enlightenment/config/e/config/samsung/e.src
index 47037af..1eab0e9 100644 (file)
--- a/arm/opt/home/app/.e/e/config/samsung/e.src
+++ b/arm/usr/share/enlightenment/config/e/config/samsung/e.src
@@ -5,7 +5,7 @@ group "E_Config" struct {
             value "zone" int: 1;
             value "desk_x" int: -1;
             value "desk_y" int: -1;
-            value "file" string: "/opt/home/app/.e/e/backgrounds/DM_Wallpaper03.edj";
+            value "file" string: "/usr/share/enlightenment/config/e/backgrounds/DM_Wallpaper03.edj";
         }
     }
     group "modules" list {

diff --git a/i386/opt/home/app/.e/e/config/samsung/exehist.src b/arm/usr/share/enlightenment/config/e/config/samsung/exehist.src
similarity index 100%
rename from i386/opt/home/app/.e/e/config/samsung/exehist.src
rename to arm/usr/share/enlightenment/config/e/config/samsung/exehist.src

diff --git a/i386/opt/home/app/.e/e/config/samsung/module.comp-tizen.src b/arm/usr/share/enlightenment/config/e/config/samsung/module.comp-tizen.src
similarity index 100%
rename from i386/opt/home/app/.e/e/config/samsung/module.comp-tizen.src
rename to arm/usr/share/enlightenment/config/e/config/samsung/module.comp-tizen.src

diff --git a/i386/opt/home/app/.e/e/config/samsung/module.devicemgr-tizen.src b/arm/usr/share/enlightenment/config/e/config/samsung/module.devicemgr-tizen.src
similarity index 100%
rename from i386/opt/home/app/.e/e/config/samsung/module.devicemgr-tizen.src
rename to arm/usr/share/enlightenment/config/e/config/samsung/module.devicemgr-tizen.src

diff --git a/i386/opt/home/app/.e/e/config/samsung/module.illume2-tizen.src b/arm/usr/share/enlightenment/config/e/config/samsung/module.illume2-tizen.src
similarity index 100%
rename from i386/opt/home/app/.e/e/config/samsung/module.illume2-tizen.src
rename to arm/usr/share/enlightenment/config/e/config/samsung/module.illume2-tizen.src

diff --git a/i386/opt/home/app/.e/e/config/samsung/module.move-tizen.src b/arm/usr/share/enlightenment/config/e/config/samsung/module.move-tizen.src
similarity index 100%
rename from i386/opt/home/app/.e/e/config/samsung/module.move-tizen.src
rename to arm/usr/share/enlightenment/config/e/config/samsung/module.move-tizen.src

diff --git a/arm/opt/home/app/.e/e/config/samsung/module.screen-reader-tizen.src b/arm/usr/share/enlightenment/config/e/config/samsung/module.screen-reader-tizen.src
similarity index 100%
rename from arm/opt/home/app/.e/e/config/samsung/module.screen-reader-tizen.src
rename to arm/usr/share/enlightenment/config/e/config/samsung/module.screen-reader-tizen.src

diff --git a/configure.ac b/configure.ac
index 6d58a07..7157007 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_INIT(e17-misc, 1.0, shiin.lee@samsung.com)
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR(configure.ac)
 
-AC_PREFIX_DEFAULT(/opt/home/app)
+AC_PREFIX_DEFAULT(/usr/share/enlightenment)
 
 PKG_CHECK_MODULES(EET, [eet])
 AC_ARG_WITH(eet-eet,
@@ -20,28 +20,28 @@ AC_SUBST(eet_eet)
 AC_CONFIG_FILES([
 Makefile
 arm/Makefile
-arm/opt/Makefile
-arm/opt/home/Makefile
-arm/opt/home/app/Makefile
-arm/opt/home/app/.e/Makefile
-arm/opt/home/app/.e/e/Makefile
-arm/opt/home/app/.e/e/config/Makefile
-arm/opt/home/app/.e/e/config/samsung/Makefile
+arm/usr/Makefile
+arm/usr/share/Makefile
+arm/usr/share/enlightenment/Makefile
+arm/usr/share/enlightenment/config/Makefile
+arm/usr/share/enlightenment/config/e/Makefile
+arm/usr/share/enlightenment/config/e/config/Makefile
+arm/usr/share/enlightenment/config/e/config/samsung/Makefile
 i386/Makefile
-i386/opt/Makefile
-i386/opt/home/Makefile
-i386/opt/home/app/Makefile
-i386/opt/home/app/.e/Makefile
-i386/opt/home/app/.e/e/Makefile
-i386/opt/home/app/.e/e/config/Makefile
-i386/opt/home/app/.e/e/config/samsung/Makefile
+i386/usr/Makefile
+i386/usr/share/Makefile
+i386/usr/share/enlightenment/Makefile
+i386/usr/share/enlightenment/config/Makefile
+i386/usr/share/enlightenment/config/e/Makefile
+i386/usr/share/enlightenment/config/e/config/Makefile
+i386/usr/share/enlightenment/config/e/config/samsung/Makefile
 emulator/Makefile
-emulator/opt/Makefile
-emulator/opt/home/Makefile
-emulator/opt/home/app/Makefile
-emulator/opt/home/app/.e/Makefile
-emulator/opt/home/app/.e/e/Makefile
-emulator/opt/home/app/.e/e/config/Makefile
-emulator/opt/home/app/.e/e/config/samsung/Makefile
+emulator/usr/Makefile
+emulator/usr/share/Makefile
+emulator/usr/share/enlightenment/Makefile
+emulator/usr/share/enlightenment/config/Makefile
+emulator/usr/share/enlightenment/config/e/Makefile
+emulator/usr/share/enlightenment/config/e/config/Makefile
+emulator/usr/share/enlightenment/config/e/config/samsung/Makefile
 ])
 AC_OUTPUT

diff --git a/emulator/Makefile.am b/emulator/Makefile.am
index d56b1df..5cccec4 100644 (file)
--- a/emulator/Makefile.am
+++ b/emulator/Makefile.am
@@ -1,2 +1,2 @@
 MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = opt 
+SUBDIRS = usr

diff --git a/emulator/opt/Makefile.am b/emulator/opt/Makefile.am
deleted file mode 100644 (file)
index 5a62302..0000000
--- a/emulator/opt/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = home

diff --git a/emulator/opt/home/Makefile.am b/emulator/opt/home/Makefile.am
deleted file mode 100644 (file)
index 2d14bf8..0000000
--- a/emulator/opt/home/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = app

diff --git a/emulator/opt/home/app/Makefile.am b/emulator/opt/home/app/Makefile.am
deleted file mode 100644 (file)
index f8b8e7f..0000000
--- a/emulator/opt/home/app/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = .e

diff --git a/arm/opt/home/Makefile.am b/emulator/usr/Makefile.am
similarity index 68%
rename from arm/opt/home/Makefile.am
rename to emulator/usr/Makefile.am
index 2d14bf8..bdb5f9d 100644 (file)
--- a/arm/opt/home/Makefile.am
+++ b/emulator/usr/Makefile.am
@@ -1,2 +1,2 @@
 MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = app
+SUBDIRS = share

diff --git a/emulator/usr/share/Makefile.am b/emulator/usr/share/Makefile.am
new file mode 100644 (file)
index 0000000..62abf46
--- /dev/null
+++ b/emulator/usr/share/Makefile.am
@@ -0,0 +1,2 @@
+MAINTAINERCLEANFILES = Makefile.in
+SUBDIRS = enlightenment

diff --git a/arm/opt/home/app/.e/e/Makefile.am b/emulator/usr/share/enlightenment/Makefile.am
similarity index 100%
rename from arm/opt/home/app/.e/e/Makefile.am
rename to emulator/usr/share/enlightenment/Makefile.am

diff --git a/emulator/opt/home/app/.e/Makefile.am b/emulator/usr/share/enlightenment/config/Makefile.am
similarity index 100%
rename from emulator/opt/home/app/.e/Makefile.am
rename to emulator/usr/share/enlightenment/config/Makefile.am

diff --git a/emulator/opt/home/app/.e/apps/launcher/config.eet b/emulator/usr/share/enlightenment/config/apps/launcher/config.eet
similarity index 100%
rename from emulator/opt/home/app/.e/apps/launcher/config.eet
rename to emulator/usr/share/enlightenment/config/apps/launcher/config.eet

diff --git a/emulator/usr/share/enlightenment/config/e/Makefile.am b/emulator/usr/share/enlightenment/config/e/Makefile.am
new file mode 100644 (file)
index 0000000..06e0395
--- /dev/null
+++ b/emulator/usr/share/enlightenment/config/e/Makefile.am
@@ -0,0 +1,2 @@
+MAINTAINERCLEANFILES = Makefile.in
+SUBDIRS = config

diff --git a/emulator/opt/home/app/.e/e/applications/startup/.order b/emulator/usr/share/enlightenment/config/e/applications/bar/default/.order
similarity index 100%
rename from emulator/opt/home/app/.e/e/applications/startup/.order
rename to emulator/usr/share/enlightenment/config/e/applications/bar/default/.order

diff --git a/emulator/opt/home/app/.e/e/applications/bar/default/.order b/emulator/usr/share/enlightenment/config/e/applications/startup/.order
similarity index 100%
rename from emulator/opt/home/app/.e/e/applications/bar/default/.order
rename to emulator/usr/share/enlightenment/config/e/applications/startup/.order

diff --git a/emulator/opt/home/app/.e/e/backgrounds/DM_Wallpaper03.edj b/emulator/usr/share/enlightenment/config/e/backgrounds/DM_Wallpaper03.edj
similarity index 100%
rename from emulator/opt/home/app/.e/e/backgrounds/DM_Wallpaper03.edj
rename to emulator/usr/share/enlightenment/config/e/backgrounds/DM_Wallpaper03.edj

diff --git a/i386/opt/home/app/.e/e/config/Makefile.am b/emulator/usr/share/enlightenment/config/e/config/Makefile.am
similarity index 64%
rename from i386/opt/home/app/.e/e/config/Makefile.am
rename to emulator/usr/share/enlightenment/config/e/config/Makefile.am
index cae6ee4..63bb3da 100644 (file)
--- a/i386/opt/home/app/.e/e/config/Makefile.am
+++ b/emulator/usr/share/enlightenment/config/e/config/Makefile.am
@@ -5,7 +5,7 @@ EET_EET = @eet_eet@
 
 EXTRA_DIST = profile.src
 
-filesdir = $(prefix)/.e/e/config/
+filesdir = $(prefix)/config/e/config/
 
 files_DATA = profile.cfg
 
@@ -13,7 +13,7 @@ SUFFIXES = .cfg
 
 .src.cfg:
        $(EET_EET) -i \
-       $(top_builddir)/i386/opt/home/app/.e/e/config/$@ config \
+       $(top_builddir)/emulator/usr/share/enlightenment/config/e/config/$@ config \
        $< 0
 
 clean-local:

diff --git a/emulator/opt/home/app/.e/e/config/profile.src b/emulator/usr/share/enlightenment/config/e/config/profile.src
similarity index 100%
rename from emulator/opt/home/app/.e/e/config/profile.src
rename to emulator/usr/share/enlightenment/config/e/config/profile.src

diff --git a/i386/opt/home/app/.e/e/config/samsung/Makefile.am b/emulator/usr/share/enlightenment/config/e/config/samsung/Makefile.am
similarity index 82%
rename from i386/opt/home/app/.e/e/config/samsung/Makefile.am
rename to emulator/usr/share/enlightenment/config/e/config/samsung/Makefile.am
index aef6066..4bfd146 100644 (file)
--- a/i386/opt/home/app/.e/e/config/samsung/Makefile.am
+++ b/emulator/usr/share/enlightenment/config/e/config/samsung/Makefile.am
@@ -11,7 +11,7 @@ EXTRA_DIST = \
          module.screen-reader-tizen.src \
          exehist.src
 
-filesdir = $(prefix)/.e/e/config/samsung/
+filesdir = $(prefix)/config/e/config/samsung/
 files_DATA = \
              module.comp-tizen.cfg \
              e.cfg \
@@ -25,7 +25,7 @@ SUFFIXES = .cfg
 
 .src.cfg:
        $(EET_EET) -e \
-       $(top_builddir)/i386/opt/home/app/.e/e/config/samsung/$@ config \
+       $(top_builddir)/emulator/usr/share/enlightenment/config/e/config/samsung/$@ config \
        $< 1
 
 clean-local:

diff --git a/i386/opt/home/app/.e/e/config/samsung/e.src b/emulator/usr/share/enlightenment/config/e/config/samsung/e.src
similarity index 100%
rename from i386/opt/home/app/.e/e/config/samsung/e.src
rename to emulator/usr/share/enlightenment/config/e/config/samsung/e.src

diff --git a/emulator/opt/home/app/.e/e/config/samsung/exehist.src b/emulator/usr/share/enlightenment/config/e/config/samsung/exehist.src
similarity index 100%
rename from emulator/opt/home/app/.e/e/config/samsung/exehist.src
rename to emulator/usr/share/enlightenment/config/e/config/samsung/exehist.src

diff --git a/emulator/opt/home/app/.e/e/config/samsung/module.comp-tizen.src b/emulator/usr/share/enlightenment/config/e/config/samsung/module.comp-tizen.src
similarity index 100%
rename from emulator/opt/home/app/.e/e/config/samsung/module.comp-tizen.src
rename to emulator/usr/share/enlightenment/config/e/config/samsung/module.comp-tizen.src

diff --git a/emulator/opt/home/app/.e/e/config/samsung/module.devicemgr-tizen.src b/emulator/usr/share/enlightenment/config/e/config/samsung/module.devicemgr-tizen.src
similarity index 100%
rename from emulator/opt/home/app/.e/e/config/samsung/module.devicemgr-tizen.src
rename to emulator/usr/share/enlightenment/config/e/config/samsung/module.devicemgr-tizen.src

diff --git a/emulator/opt/home/app/.e/e/config/samsung/module.illume2-tizen.src b/emulator/usr/share/enlightenment/config/e/config/samsung/module.illume2-tizen.src
similarity index 100%
rename from emulator/opt/home/app/.e/e/config/samsung/module.illume2-tizen.src
rename to emulator/usr/share/enlightenment/config/e/config/samsung/module.illume2-tizen.src

diff --git a/emulator/opt/home/app/.e/e/config/samsung/module.move-tizen.src b/emulator/usr/share/enlightenment/config/e/config/samsung/module.move-tizen.src
similarity index 100%
rename from emulator/opt/home/app/.e/e/config/samsung/module.move-tizen.src
rename to emulator/usr/share/enlightenment/config/e/config/samsung/module.move-tizen.src

diff --git a/i386/opt/home/app/.e/e/config/samsung/module.screen-reader-tizen.src b/emulator/usr/share/enlightenment/config/e/config/samsung/module.screen-reader-tizen.src
similarity index 100%
rename from i386/opt/home/app/.e/e/config/samsung/module.screen-reader-tizen.src
rename to emulator/usr/share/enlightenment/config/e/config/samsung/module.screen-reader-tizen.src

diff --git a/i386/Makefile.am b/i386/Makefile.am
index d56b1df..5cccec4 100644 (file)
--- a/i386/Makefile.am
+++ b/i386/Makefile.am
@@ -1,2 +1,2 @@
 MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = opt 
+SUBDIRS = usr

diff --git a/i386/opt/Makefile.am b/i386/opt/Makefile.am
deleted file mode 100644 (file)
index 5a62302..0000000
--- a/i386/opt/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = home

diff --git a/i386/opt/home/Makefile.am b/i386/opt/home/Makefile.am
deleted file mode 100644 (file)
index 2d14bf8..0000000
--- a/i386/opt/home/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = app

diff --git a/i386/opt/home/app/Makefile.am b/i386/opt/home/app/Makefile.am
deleted file mode 100644 (file)
index f8b8e7f..0000000
--- a/i386/opt/home/app/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = .e

diff --git a/arm/opt/home/app/Makefile.am b/i386/usr/Makefile.am
similarity index 68%
rename from arm/opt/home/app/Makefile.am
rename to i386/usr/Makefile.am
index f8b8e7f..bdb5f9d 100644 (file)
--- a/arm/opt/home/app/Makefile.am
+++ b/i386/usr/Makefile.am
@@ -1,2 +1,2 @@
 MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = .e
+SUBDIRS = share

diff --git a/i386/usr/share/Makefile.am b/i386/usr/share/Makefile.am
new file mode 100644 (file)
index 0000000..62abf46
--- /dev/null
+++ b/i386/usr/share/Makefile.am
@@ -0,0 +1,2 @@
+MAINTAINERCLEANFILES = Makefile.in
+SUBDIRS = enlightenment

diff --git a/i386/usr/share/enlightenment/Makefile.am b/i386/usr/share/enlightenment/Makefile.am
new file mode 100644 (file)
index 0000000..06e0395
--- /dev/null
+++ b/i386/usr/share/enlightenment/Makefile.am
@@ -0,0 +1,2 @@
+MAINTAINERCLEANFILES = Makefile.in
+SUBDIRS = config

diff --git a/arm/opt/home/app/.e/Makefile.am b/i386/usr/share/enlightenment/config/Makefile.am
similarity index 100%
rename from arm/opt/home/app/.e/Makefile.am
rename to i386/usr/share/enlightenment/config/Makefile.am

diff --git a/arm/opt/home/app/.e/apps/launcher/config.eet b/i386/usr/share/enlightenment/config/apps/launcher/config.eet
similarity index 100%
rename from arm/opt/home/app/.e/apps/launcher/config.eet
rename to i386/usr/share/enlightenment/config/apps/launcher/config.eet

diff --git a/i386/usr/share/enlightenment/config/e/Makefile.am b/i386/usr/share/enlightenment/config/e/Makefile.am
new file mode 100644 (file)
index 0000000..06e0395
--- /dev/null
+++ b/i386/usr/share/enlightenment/config/e/Makefile.am
@@ -0,0 +1,2 @@
+MAINTAINERCLEANFILES = Makefile.in
+SUBDIRS = config

diff --git a/arm/opt/home/app/.e/e/applications/startup/.order b/i386/usr/share/enlightenment/config/e/applications/bar/default/.order
similarity index 100%
rename from arm/opt/home/app/.e/e/applications/startup/.order
rename to i386/usr/share/enlightenment/config/e/applications/bar/default/.order

diff --git a/arm/opt/home/app/.e/e/applications/bar/default/.order b/i386/usr/share/enlightenment/config/e/applications/startup/.order
similarity index 100%
rename from arm/opt/home/app/.e/e/applications/bar/default/.order
rename to i386/usr/share/enlightenment/config/e/applications/startup/.order

diff --git a/arm/opt/home/app/.e/e/backgrounds/DM_Wallpaper03.edj b/i386/usr/share/enlightenment/config/e/backgrounds/DM_Wallpaper03.edj
similarity index 100%
rename from arm/opt/home/app/.e/e/backgrounds/DM_Wallpaper03.edj
rename to i386/usr/share/enlightenment/config/e/backgrounds/DM_Wallpaper03.edj

diff --git a/emulator/opt/home/app/.e/e/config/Makefile.am b/i386/usr/share/enlightenment/config/e/config/Makefile.am
similarity index 65%
rename from emulator/opt/home/app/.e/e/config/Makefile.am
rename to i386/usr/share/enlightenment/config/e/config/Makefile.am
index 13db28b..390cc5b 100644 (file)
--- a/emulator/opt/home/app/.e/e/config/Makefile.am
+++ b/i386/usr/share/enlightenment/config/e/config/Makefile.am
@@ -5,7 +5,7 @@ EET_EET = @eet_eet@
 
 EXTRA_DIST = profile.src
 
-filesdir = $(prefix)/.e/e/config/
+filesdir = $(prefix)/config/e/config/
 
 files_DATA = profile.cfg
 
@@ -13,7 +13,7 @@ SUFFIXES = .cfg
 
 .src.cfg:
        $(EET_EET) -i \
-       $(top_builddir)/emulator/opt/home/app/.e/e/config/$@ config \
+       $(top_builddir)/i386/usr/share/enlightenment/config/e/config/$@ config \
        $< 0
 
 clean-local:

diff --git a/arm/opt/home/app/.e/e/config/profile.src b/i386/usr/share/enlightenment/config/e/config/profile.src
similarity index 100%
rename from arm/opt/home/app/.e/e/config/profile.src
rename to i386/usr/share/enlightenment/config/e/config/profile.src

diff --git a/emulator/opt/home/app/.e/e/config/samsung/Makefile.am b/i386/usr/share/enlightenment/config/e/config/samsung/Makefile.am
similarity index 83%
rename from emulator/opt/home/app/.e/e/config/samsung/Makefile.am
rename to i386/usr/share/enlightenment/config/e/config/samsung/Makefile.am
index 357cb39..ea89520 100644 (file)
--- a/emulator/opt/home/app/.e/e/config/samsung/Makefile.am
+++ b/i386/usr/share/enlightenment/config/e/config/samsung/Makefile.am
@@ -11,7 +11,7 @@ EXTRA_DIST = \
          module.screen-reader-tizen.src \
          exehist.src
 
-filesdir = $(prefix)/.e/e/config/samsung/
+filesdir = $(prefix)/config/e/config/samsung/
 files_DATA = \
              module.comp-tizen.cfg \
              e.cfg \
@@ -25,7 +25,7 @@ SUFFIXES = .cfg
 
 .src.cfg:
        $(EET_EET) -e \
-       $(top_builddir)/emulator/opt/home/app/.e/e/config/samsung/$@ config \
+       $(top_builddir)/i386/usr/share/enlightenment/config/e/config/samsung/$@ config \
        $< 1
 
 clean-local:

diff --git a/emulator/opt/home/app/.e/e/config/samsung/e.src b/i386/usr/share/enlightenment/config/e/config/samsung/e.src
similarity index 100%
rename from emulator/opt/home/app/.e/e/config/samsung/e.src
rename to i386/usr/share/enlightenment/config/e/config/samsung/e.src

diff --git a/arm/opt/home/app/.e/e/config/samsung/exehist.src b/i386/usr/share/enlightenment/config/e/config/samsung/exehist.src
similarity index 100%
rename from arm/opt/home/app/.e/e/config/samsung/exehist.src
rename to i386/usr/share/enlightenment/config/e/config/samsung/exehist.src

diff --git a/arm/opt/home/app/.e/e/config/samsung/module.comp-tizen.src b/i386/usr/share/enlightenment/config/e/config/samsung/module.comp-tizen.src
similarity index 100%
rename from arm/opt/home/app/.e/e/config/samsung/module.comp-tizen.src
rename to i386/usr/share/enlightenment/config/e/config/samsung/module.comp-tizen.src

diff --git a/arm/opt/home/app/.e/e/config/samsung/module.devicemgr-tizen.src b/i386/usr/share/enlightenment/config/e/config/samsung/module.devicemgr-tizen.src
similarity index 100%
rename from arm/opt/home/app/.e/e/config/samsung/module.devicemgr-tizen.src
rename to i386/usr/share/enlightenment/config/e/config/samsung/module.devicemgr-tizen.src

diff --git a/arm/opt/home/app/.e/e/config/samsung/module.illume2-tizen.src b/i386/usr/share/enlightenment/config/e/config/samsung/module.illume2-tizen.src
similarity index 100%
rename from arm/opt/home/app/.e/e/config/samsung/module.illume2-tizen.src
rename to i386/usr/share/enlightenment/config/e/config/samsung/module.illume2-tizen.src

diff --git a/arm/opt/home/app/.e/e/config/samsung/module.move-tizen.src b/i386/usr/share/enlightenment/config/e/config/samsung/module.move-tizen.src
similarity index 100%
rename from arm/opt/home/app/.e/e/config/samsung/module.move-tizen.src
rename to i386/usr/share/enlightenment/config/e/config/samsung/module.move-tizen.src

diff --git a/emulator/opt/home/app/.e/e/config/samsung/module.screen-reader-tizen.src b/i386/usr/share/enlightenment/config/e/config/samsung/module.screen-reader-tizen.src
similarity index 100%
rename from emulator/opt/home/app/.e/e/config/samsung/module.screen-reader-tizen.src
rename to i386/usr/share/enlightenment/config/e/config/samsung/module.screen-reader-tizen.src

diff --git a/packaging/e17-misc.spec b/packaging/e17-misc.spec
index 70d5e4f..bfea67a 100644 (file)
--- a/packaging/e17-misc.spec
+++ b/packaging/e17-misc.spec
@@ -23,7 +23,7 @@ cp %{SOURCE1001} .
 
 %build
 %autogen
-%configure --prefix=/opt/home/app
+%configure --prefix=/usr/share/enlightenment
 make
 
 %install
@@ -35,70 +35,78 @@ cp -a COPYING %{buildroot}/usr/share/license/%{name}
 
 %ifarch %{arm}
 # ARM build target
-%__mkdir_p %{buildroot}/opt/home/app/.e/apps
-%__cp -afr %{_arch}/opt/home/app/.e/apps/* %{buildroot}/opt/home/app/.e/apps
+%__mkdir_p %{buildroot}/usr/share/enlightenment/config/apps
+%__cp -afr %{_arch}/usr/share/enlightenment/config/apps/* %{buildroot}/usr/share/enlightenment/config/apps
 
-%__mkdir_p %{buildroot}/opt/home/app/.e/e/applications
-%__cp -afr %{_arch}/opt/home/app/.e/e/applications/* %{buildroot}/opt/home/app/.e/e/applications
+%__mkdir_p %{buildroot}/usr/share/enlightenment/config/e/applications
+%__cp -afr %{_arch}/usr/share/enlightenment/config/e/applications/* %{buildroot}/usr/share/enlightenment/config/e/applications
 
-%__mkdir_p %{buildroot}/opt/home/app/.e/e/backgrounds
-%__cp -afr %{_arch}/opt/home/app/.e/e/backgrounds/* %{buildroot}/opt/home/app/.e/e/backgrounds
+%__mkdir_p %{buildroot}/usr/share/enlightenment/config/e/backgrounds
+%__cp -afr %{_arch}/usr/share/enlightenment/config/e/backgrounds/* %{buildroot}/usr/share/enlightenment/config/e/backgrounds
 
-%__cp -afr %{_arch}/opt/home/app/.e/e/config/*.cfg %{buildroot}/opt/home/app/.e/e/config
-%__cp -afr %{_arch}/opt/home/app/.e/e/config/samsung/*.cfg %{buildroot}/opt/home/app/.e/e/config/samsung
+%__mkdir_p %{buildroot}/usr/share/enlightenment/config/e/config
+%__cp -afr %{_arch}/usr/share/enlightenment/config/e/config/*.cfg %{buildroot}/usr/share/enlightenment/config/e/config/
+
+%__mkdir_p %{buildroot}/usr/share/enlightenment/config/e/config/samsung
+%__cp -afr %{_arch}/usr/share/enlightenment/config/e/config/samsung/*.cfg %{buildroot}/usr/share/enlightenment/config/e/config/samsung/
 
 %else
 
 %if 0%{?simulator}
 # emul build target
-%__mkdir_p %{buildroot}/opt/home/app/.e/apps
-%__cp -afr emulator/opt/home/app/.e/apps/* %{buildroot}/opt/home/app/.e/apps
+%__mkdir_p %{buildroot}/usr/share/enlightenment/config/apps
+%__cp -afr emulator/usr/share/enlightenment/config/apps/* %{buildroot}/usr/share/enlightenment/config/apps
+
+%__mkdir_p %{buildroot}/usr/share/enlightenment/config/e/applications
+%__cp -afr emulator/usr/share/enlightenment/config/e/applications/* %{buildroot}/usr/share/enlightenment/config/e/applications
 
-%__mkdir_p %{buildroot}/opt/home/app/.e/e/applications
-%__cp -afr emulator/opt/home/app/.e/e/applications/* %{buildroot}/opt/home/app/.e/e/applications
+%__mkdir_p %{buildroot}/usr/share/enlightenment/config/e/backgrounds
+%__cp -afr emulator/usr/share/enlightenment/config/e/backgrounds/* %{buildroot}/usr/share/enlightenment/config/e/backgrounds
 
-%__mkdir_p %{buildroot}/opt/home/app/.e/e/backgrounds
-%__cp -afr emulator/opt/home/app/.e/e/backgrounds/* %{buildroot}/opt/home/app/.e/e/backgrounds
+%__mkdir_p %{buildroot}/usr/share/enlightenment/config/e/config
+%__cp -afr emulator/usr/share/enlightenment/config/e/config/*.cfg %{buildroot}/usr/share/enlightenment/config/e/config/
 
-%__cp -afr emulator/opt/home/app/.e/e/config/*.cfg %{buildroot}/opt/home/app/.e/e/config
-%__cp -afr emulator/opt/home/app/.e/e/config/samsung/*.cfg %{buildroot}/opt/home/app/.e/e/config/samsung
+%__mkdir_p %{buildroot}/usr/share/enlightenment/config/e/config/samsung
+%__cp -afr emulator/usr/share/enlightenment/config/e/config/samsung/*.cfg %{buildroot}/usr/share/enlightenment/config/e/config/samsung/
 
 %else
 # IA build target
-%__mkdir_p %{buildroot}/opt/home/app/.e/apps
-%__cp -afr %{_arch}/opt/home/app/.e/apps/* %{buildroot}/opt/home/app/.e/apps
+%__mkdir_p %{buildroot}/usr/share/enlightenment/config/apps
+%__cp -afr %{_arch}/usr/share/enlightenment/config/apps/* %{buildroot}/usr/share/enlightenment/config/apps
+
+%__mkdir_p %{buildroot}/usr/share/enlightenment/config/e/applications
+%__cp -afr %{_arch}/usr/share/enlightenment/config/e/applications/* %{buildroot}/usr/share/enlightenment/config/e/applications
 
-%__mkdir_p %{buildroot}/opt/home/app/.e/e/applications
-%__cp -afr %{_arch}/opt/home/app/.e/e/applications/* %{buildroot}/opt/home/app/.e/e/applications
+%__mkdir_p %{buildroot}/usr/share/enlightenment/config/e/backgrounds
+%__cp -afr %{_arch}/usr/share/enlightenment/config/e/backgrounds/* %{buildroot}/usr/share/enlightenment/config/e/backgrounds
 
-%__mkdir_p %{buildroot}/opt/home/app/.e/e/backgrounds
-%__cp -afr %{_arch}/opt/home/app/.e/e/backgrounds/* %{buildroot}/opt/home/app/.e/e/backgrounds
+%__mkdir_p %{buildroot}/usr/share/enlightenment/config/e/config
+%__cp -afr %{_arch}/usr/share/enlightenment/config/e/config/*.cfg %{buildroot}/usr/share/enlightenment/config/e/config/
 
-%__cp -afr %{_arch}/opt/home/app/.e/e/config/*.cfg %{buildroot}/opt/home/app/.e/e/config
-%__cp -afr %{_arch}/opt/home/app/.e/e/config/samsung/*.cfg %{buildroot}/opt/home/app/.e/e/config/samsung
+%__mkdir_p %{buildroot}/usr/share/enlightenment/config/e/config/samsung
+%__cp -afr %{_arch}/usr/share/enlightenment/config/e/config/samsung/*.cfg %{buildroot}/usr/share/enlightenment/config/e/config/samsung/
 
 %endif
 %endif
 
 %__mkdir_p %{buildroot}%{_sysconfdir}/skel
- %__cp -af %{buildroot}/opt/home/app/.e %{buildroot}%{_sysconfdir}/skel/.e
+ %__cp -af %{buildroot}/usr/share/enlightenment/config %{buildroot}%{_sysconfdir}/skel/config
 
 %pre
-if [ ! -e "home/app" ]
+if [ ! -e "/usr/share/enlightenment/config" ]
 then
-   %__mkdir_p /home/app
+   mkdir -p /usr/share/enlightenment/config
 fi
-chown 5000:5000 /home/app
-chmod 755 /home/app
+chmod 755 /usr/share/enlightenment/config
 
 %post
-# XXX comptibility with sysvinit-based images
-chown -R 5000:5000 /opt/home/app
+chmod 644 /usr/share/enlightenment/config/e/config/*.cfg
+chmod 644 /usr/share/enlightenment/config/e/config/samsung/*.cfg
 
 %files
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-/opt/home/app/.e
+/usr/share/enlightenment/config
 /usr/share/license/%{name}
 
-%config %{_sysconfdir}/skel/.e
+%config %{_sysconfdir}/skel/config