Move definition of several directory paths to configure.ac

Define directories where data and programmes are installed in
configure.ac and refer to those values in scripts and programmes.

Move executable programmes and scripts from /usr/lib to /usr/libexec.

Change-Id: Ibef97c88497d9d5b56b4a9a1eb3ea333927b7df3
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>

diff --git a/Makefile.am b/Makefile.am
index 09d3280..8bd11a3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,9 +2,9 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 SUBDIRS = .
 
-initrd_recovery_libexecdir=$(prefix)/lib/initrd-recovery
-initrd_recovery_sharedir=$(prefix)/share/initrd-recovery
-initrd_recovery_install_dropindir=$(initrd_recovery_sharedir)/initrd.list.d
+initrd_recovery_libexecdir=$(INITRD_RECOVERY_LIBEXEC_DIR)
+initrd_recovery_datadir=$(INITRD_RECOVERY_DATA_DIR)
+initrd_recovery_install_dropindir=$(INITRD_RECOVERY_INSTALL_DROPIN_DIR)
 
 DEFAULT_CFLAGS = \
        $(LIBSYSTEM_CFLAGS) \
@@ -102,16 +102,10 @@ librui_la_LIBADD = \
 endif
 
 # ------------------------------------------------------------------------------
-system_recovery_libexecdir = \
-       $(prefix)/lib/system-recovery
+system_recovery_imagedir = $(SYSTEM_RECOVERY_IMAGE_DIR)
+system_recovery_libexecdir = $(SYSTEM_RECOVERY_LIBEXEC_DIR)
 
 if RECOVERY_GUI
-system_recovery_resdir = \
-       $(system_recovery_libexecdir)/res
-
-system_recovery_res_imagedir = \
-       $(system_recovery_resdir)/images
-
 system_recovery_SOURCES = \
        src/system-recovery/process-util.c \
        src/system-recovery/recovery-main.c \
@@ -129,7 +123,7 @@ system_recovery_LDADD = \
 system_recovery_libexec_PROGRAMS = \
        system-recovery
 
-system_recovery_res_image_DATA = \
+system_recovery_image_DATA = \
        src/system-recovery/res/images/font.png \
        src/system-recovery/res/images/menu-title.png \
        src/system-recovery/res/images/tizen-anim.png \
@@ -161,6 +155,10 @@ substitutions = \
        '|includedir=$(includedir)|' \
        '|VERSION=$(VERSION)|' \
        '|MKDIR_P=$(MKDIR_P)|' \
+       '|INITRD_RECOVERY_INSTALL_DROPIN_DIR=$(INITRD_RECOVERY_INSTALL_DROPIN_DIR)|' \
+       '|INITRD_RECOVERY_LIBEXEC_DIR=$(INITRD_RECOVERY_LIBEXEC_DIR)|' \
+       '|SYSTEM_RECOVERY_IMAGE_DIR=$(SYSTEM_RECOVERY_IMAGE_DIR)|' \
+       '|SYSTEM_RECOVERY_LIBEXEC_DIR=$(SYSTEM_RECOVERY_LIBEXEC_DIR)|' \
        '|RECOVERY_GUI=$(RECOVERY_GUI)|'
 
 SED_PROCESS = \

diff --git a/configure.ac b/configure.ac
index 54e08e0..4f131a7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -6,6 +6,7 @@ AC_INIT([initrd-recovery], [2.1.1], [walyong.cho@samsung.com])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_AUX_DIR([build-aux])
 
 AC_USE_SYSTEM_EXTENSIONS
 AC_SYS_LARGEFILE
@@ -60,7 +61,6 @@ AC_SUBST([OUR_CFLAGS], "$our_cflags")
 AC_SUBST([OUR_LDFLAGS], "$our_ldflags")
 
 M4_DEFINES=
-
 # ------------------------------------------------------------------------------
 AC_ARG_WITH([tdm],
        AS_HELP_STRING([--without-tdm], [disable TDM/TBM graphical backend (default: test)]))
@@ -98,6 +98,32 @@ AC_SUBST([RECOVERY_GUI])
 AM_CONDITIONAL([RECOVERY_GUI], [test "x$enable_recovery_gui" != "xno"])
 AM_CONDITIONAL([HAVE_TDM], [test "x$have_libtdm" = "xyes"])
 
+SYSTEM_RECOVERY_DATA_DIR="${datadir}/system-recovery"
+AC_DEFINE_UNQUOTED([SYSTEM_RECOVERY_DATA_DIR], ["$SYSTEM_RECOVERY_DATA_DIR"], "Directory where data for system-recovery UI are stored")
+AC_SUBST([SYSTEM_RECOVERY_DATA_DIR])
+
+SYSTEM_RECOVERY_IMAGE_DIR="${datadir}/system-recovery/res/images"
+AC_DEFINE_UNQUOTED([SYSTEM_RECOVERY_IMAGE_DIR], ["$SYSTEM_RECOVERY_IMAGE_DIR"], "Directory where images for system-recovery UI are stored")
+AC_SUBST([SYSTEM_RECOVERY_IMAGE_DIR])
+
+RUI_IMAGES_DIR="${SYSTEM_RECOVERY_IMAGE_DIR}"
+AC_DEFINE_UNQUOTED([RUI_IMAGES_DIR], ["$RUI_IMAGES_DIR"], "Directory where images for system-recovery UI are stored")
+
+SYSTEM_RECOVERY_LIBEXEC_DIR="${libexecdir}/system-recovery"
+AC_DEFINE_UNQUOTED([SYSTEM_RECOVERY_LIBEXEC_DIR], ["$SYSTEM_RECOVERY_LIBEXEC_DIR"], "Directory where sub-programmes for system-recovery UI are stored")
+AC_SUBST([SYSTEM_RECOVERY_LIBEXEC_DIR])
+
+INITRD_RECOVERY_DATA_DIR="${datadir}/initrd-recovery"
+AC_DEFINE_UNQUOTED([INITRD_RECOVERY_DATA_DIR], ["$INITRD_RECOVERY_DATA_DIR"], "Directory where data for recovery initrd are stored")
+AC_SUBST([INITRD_RECOVERY_DATA_DIR])
+
+INITRD_RECOVERY_INSTALL_DROPIN_DIR="${INITRD_RECOVERY_DATA_DIR}/initrd.list.d"
+AC_DEFINE_UNQUOTED([INITRD_RECOVERY_INSTALL_DROPIN_DIR], ["$INITRD_RECOVERY_INSTALL_DROPIN_DIR"], "Directory where configuration drop-in files for recovery initrd are stored")
+AC_SUBST([INITRD_RECOVERY_INSTALL_DROPIN_DIR])
+
+INITRD_RECOVERY_LIBEXEC_DIR="${libexecdir}/initrd-recovery"
+AC_DEFINE_UNQUOTED([INITRD_RECOVERY_LIBEXEC_DIR], ["$INITRD_RECOVERY_LIBEXEC_DIR"], "Directory where sub-progremmes for recovery initrd are stored")
+AC_SUBST([INITRD_RECOVERY_LIBEXEC_DIR])
 # ------------------------------------------------------------------------------
 AC_SUBST(M4_DEFINES)
 

diff --git a/packaging/initrd-recovery.spec b/packaging/initrd-recovery.spec
index f4e6358..4f83f80 100644 (file)
--- a/packaging/initrd-recovery.spec
+++ b/packaging/initrd-recovery.spec
@@ -97,8 +97,8 @@ popd
 # common, wearable
 pushd build_non_gui
 %make_install
-mv %{buildroot}%{_libdir}/system-recovery/recovery-init \
-          %{buildroot}%{_libdir}/system-recovery/recovery-init.non_gui
+mv %{buildroot}%{_libexecdir}/system-recovery/recovery-init \
+          %{buildroot}%{_libexecdir}/system-recovery/recovery-init.non_gui
 mv %{buildroot}%{_datadir}/initrd-recovery/initrd.list.d/50-system-recovery.list \
           %{buildroot}%{_datadir}/initrd-recovery/initrd.list.d/50-system-recovery.list.non_gui
 popd
@@ -106,8 +106,8 @@ popd
 # mobile
 pushd build_gui
 %make_install
-mv %{buildroot}%{_libdir}/system-recovery/recovery-init \
-          %{buildroot}%{_libdir}/system-recovery/recovery-init.gui
+mv %{buildroot}%{_libexecdir}/system-recovery/recovery-init \
+          %{buildroot}%{_libexecdir}/system-recovery/recovery-init.gui
 mv %{buildroot}%{_datadir}/initrd-recovery/initrd.list.d/50-system-recovery.list \
           %{buildroot}%{_datadir}/initrd-recovery/initrd.list.d/50-system-recovery.list.gui
 popd
@@ -120,36 +120,36 @@ install -m 644 units/mnt-inform.mount %{buildroot}%{_unitdir}
 ln -s ../mnt-inform.mount %{buildroot}%{_unitdir}/local-fs.target.wants
 
 %post -n system-recovery-non_gui
-ln -s %{_libdir}/system-recovery/recovery-init.non_gui \
-          %{_libdir}/system-recovery/recovery-init
+ln -s %{_libexecdir}/system-recovery/recovery-init.non_gui \
+          %{_libexecdir}/system-recovery/recovery-init
 mv %{_datadir}/initrd-recovery/initrd.list.d/50-system-recovery.list.non_gui \
           %{_datadir}/initrd-recovery/initrd.list.d/50-system-recovery.list
 %preun -n system-recovery-non_gui
-rm -f %{_libdir}/system-recovery/recovery-init
+rm -f %{_libexecdir}/system-recovery/recovery-init
 mv %{_datadir}/initrd-recovery/initrd.list.d/50-system-recovery.list \
           %{_datadir}/initrd-recovery/initrd.list.d/50-system-recovery.list.non_gui
 
 %post -n system-recovery-gui
-ln -s %{_libdir}/system-recovery/recovery-init.gui \
-          %{_libdir}/system-recovery/recovery-init
+ln -s %{_libexecdir}/system-recovery/recovery-init.gui \
+          %{_libexecdir}/system-recovery/recovery-init
 mv %{_datadir}/initrd-recovery/initrd.list.d/50-system-recovery.list.gui \
           %{_datadir}/initrd-recovery/initrd.list.d/50-system-recovery.list
 %preun -n system-recovery-gui
-rm -f %{_libdir}/system-recovery/recovery-init
+rm -f %{_libexecdir}/system-recovery/recovery-init
 mv %{_datadir}/initrd-recovery/initrd.list.d/50-system-recovery.list \
           %{_datadir}/initrd-recovery/initrd.list.d/50-system-recovery.list.gui
 
 %posttrans
-%{_libdir}/initrd-recovery/mkinitrd-recovery.sh
+%{_libexecdir}/initrd-recovery/mkinitrd-recovery.sh
 
 %files
 %defattr(-,root,root,-)
 %manifest initrd-recovery.manifest
-%{_libdir}/initrd-recovery/init
-%{_libdir}/initrd-recovery/mkinitrd-recovery.sh
-%{_libdir}/initrd-recovery/minireboot
-%{_datadir}/initrd-recovery/initrd.list.d/00-initrd-recovery.list
 %license LICENSE
+%{_datadir}/initrd-recovery/initrd.list.d/00-initrd-recovery.list
+%{_libexecdir}/initrd-recovery/init
+%{_libexecdir}/initrd-recovery/mkinitrd-recovery.sh
+%{_libexecdir}/initrd-recovery/minireboot
 
 %files -n system-recovery
 %defattr(-,root,root,-)
@@ -157,13 +157,13 @@ mv %{_datadir}/initrd-recovery/initrd.list.d/50-system-recovery.list \
 
 %files -n system-recovery-non_gui
 %{_datadir}/initrd-recovery/initrd.list.d/50-system-recovery.list.non_gui
-%{_libdir}/system-recovery/recovery-init.non_gui
+%{_libexecdir}/system-recovery/recovery-init.non_gui
 
 %files -n system-recovery-gui
 %{_datadir}/initrd-recovery/initrd.list.d/50-system-recovery.list.gui
-%{_libdir}/system-recovery/recovery-init.gui
-%{_libdir}/system-recovery/system-recovery
-%{_libdir}/system-recovery/res/images/*.png
+%{_datadir}/system-recovery/res/images/*.png
+%{_libexecdir}/system-recovery/recovery-init.gui
+%{_libexecdir}/system-recovery/system-recovery
 
 %files -n reboot-param-helper
 %{_unitdir}/mnt-inform.mount

diff --git a/src/initrd-recovery/00-initrd-recovery.list b/src/initrd-recovery/00-initrd-recovery.list.in
similarity index 57%
rename from src/initrd-recovery/00-initrd-recovery.list
rename to src/initrd-recovery/00-initrd-recovery.list.in
index d5d28ed..42d30be 100644 (file)
--- a/src/initrd-recovery/00-initrd-recovery.list
+++ b/src/initrd-recovery/00-initrd-recovery.list.in
@@ -1,7 +1,7 @@
 # ---- Target contents ----------------------------------------------------- #
 MVWITHLIBS="
-/usr/lib/initrd-recovery/init
-/usr/lib/initrd-recovery/minireboot
+@INITRD_RECOVERY_LIBEXEC_DIR@/init
+@INITRD_RECOVERY_LIBEXEC_DIR@/minireboot
 "
 
 WITHLIBS="
@@ -21,7 +21,7 @@ WITHLIBS="
 # LinkFileName:Target
 SYMLINKS="
 /bin/sh:bash
-/sbin/init:/usr/lib/initrd-recovery/init
-/sbin/minireboot:/usr/lib/initrd-recovery/minireboot
-/sbin/reboot:/usr/lib/initrd-recovery/minireboot
+/sbin/init:@INITRD_RECOVERY_LIBEXEC_DIR@/init
+/sbin/minireboot:@INITRD_RECOVERY_LIBEXEC_DIR@/minireboot
+/sbin/reboot:@INITRD_RECOVERY_LIBEXEC_DIR@/minireboot
 "

diff --git a/src/initrd-recovery/mkinitrd-recovery.sh b/src/initrd-recovery/mkinitrd-recovery.sh.in
similarity index 99%
rename from src/initrd-recovery/mkinitrd-recovery.sh
rename to src/initrd-recovery/mkinitrd-recovery.sh.in
index aa01d8b..18e3173 100755 (executable)
--- a/src/initrd-recovery/mkinitrd-recovery.sh
+++ b/src/initrd-recovery/mkinitrd-recovery.sh.in
@@ -16,7 +16,7 @@ CUT="/bin/cut"
 
 INITRD_ROOT="/mnt/initrd-recovery"
 
-OBJECTS_SPECIFY_DIR="/usr/share/initrd-recovery/initrd.list.d"
+OBJECTS_SPECIFY_DIR="@INITRD_RECOVERY_INSTALL_DROPIN_DIR@"
 OBJECTS_DIRECTORY=
 OBJECTS_VERBATIM=
 OBJECTS_WITHLIB=

diff --git a/src/librui/rui-image.h b/src/librui/rui-image.h
index 03a6b3e..bd7408f 100644 (file)
--- a/src/librui/rui-image.h
+++ b/src/librui/rui-image.h
@@ -24,9 +24,6 @@
 extern "C" {
 #endif
 
-/* #define RUI_IMAGES_DIR  "/usr/share/librui/res/images" */
-#define RUI_IMAGES_DIR  "/usr/lib/system-recovery/res/images"
-
 typedef enum {
        RUI_IMAGE_NONE = -1
 } rui_image_id;

diff --git a/src/system-recovery/50-system-recovery.list.m4 b/src/system-recovery/50-system-recovery.list.m4
deleted file mode 100644 (file)
index add69bc..0000000
--- a/src/system-recovery/50-system-recovery.list.m4
+++ /dev/null
@@ -1,49 +0,0 @@
-# ---- Target contents ----------------------------------------------------- #
-DIRECTORIES="
-/dev
-/etc
-/proc
-/smack
-/sys
-/system
-/tmp
-/usr/bin
-/usr/lib
-/usr/sbin
-"
-
-DIR_SYMLINKS="
-/bin:usr/bin
-/lib:usr/lib
-/sbin:usr/sbin
-"
-
-MVWITHLIBS="
-/usr/lib/system-recovery/recovery-init
-/usr/lib/initrd-recovery/minireboot
-m4_ifdef(`RECOVERY_GUI',
-`/usr/lib/system-recovery/res/images/font.png
-/usr/lib/system-recovery/res/images/menu-title.png
-/usr/lib/system-recovery/res/images/tizen-anim.png
-/usr/lib/system-recovery/res/images/warning.png')
-m4_ifdef(`RECOVERY_GUI', `/usr/lib/system-recovery/system-recovery')
-"
-
-WITHLIBS="
-/usr/bin/bash
-/usr/bin/grep
-/usr/bin/mount
-/usr/bin/sync
-/usr/bin/touch
-/usr/bin/umount
-/usr/sbin/partx
-/usr/sbin/blkid
-/usr/bin/ls
-/usr/sbin/agetty
-"
-
-# LinkFileName:Target
-SYMLINKS="
-/usr/bin/system-recovery:/usr/lib/system-recovery/system-recovery
-/sbin/recovery-init:/usr/lib/system-recovery/recovery-init
-"

diff --git a/src/system-recovery/50-system-recovery.list.m4.in b/src/system-recovery/50-system-recovery.list.m4.in
new file mode 100644 (file)
index 0000000..6a813e0
--- /dev/null
+++ b/src/system-recovery/50-system-recovery.list.m4.in
@@ -0,0 +1,49 @@
+# ---- Target contents ----------------------------------------------------- #
+DIRECTORIES="
+/dev
+/etc
+/proc
+/smack
+/sys
+/system
+/tmp
+/usr/bin
+/usr/lib
+/usr/sbin
+"
+
+DIR_SYMLINKS="
+/bin:usr/bin
+/lib:usr/lib
+/sbin:usr/sbin
+"
+
+MVWITHLIBS="
+@SYSTEM_RECOVERY_LIBEXEC_DIR@/recovery-init
+@INITRD_RECOVERY_LIBEXEC_DIR@/minireboot
+m4_ifdef(`RECOVERY_GUI',
+`/usr/share/system-recovery/res/images/font.png
+/usr/share/system-recovery/res/images/menu-title.png
+/usr/share/system-recovery/res/images/tizen-anim.png
+/usr/share/system-recovery/res/images/warning.png')
+m4_ifdef(`RECOVERY_GUI', `@SYSTEM_RECOVERY_LIBEXEC_DIR@/system-recovery')
+"
+
+WITHLIBS="
+/usr/bin/bash
+/usr/bin/grep
+/usr/bin/mount
+/usr/bin/sync
+/usr/bin/touch
+/usr/bin/umount
+/usr/sbin/partx
+/usr/sbin/blkid
+/usr/bin/ls
+/usr/sbin/agetty
+"
+
+# LinkFileName:Target
+SYMLINKS="
+/usr/bin/system-recovery:@SYSTEM_RECOVERY_LIBEXEC_DIR@/system-recovery
+/sbin/recovery-init:@SYSTEM_RECOVERY_LIBEXEC_DIR@/recovery-init
+"

diff --git a/src/system-recovery/recovery-init.in b/src/system-recovery/recovery-init.in
index 171920a..825073d 100644 (file)
--- a/src/system-recovery/recovery-init.in
+++ b/src/system-recovery/recovery-init.in
@@ -7,7 +7,7 @@ GREP="/usr/bin/grep"
 MOUNT="/usr/bin/mount"
 PARTX="/usr/sbin/partx"
 BLKID="/usr/sbin/blkid"
-REBOOT="/usr/lib/initrd-recovery/minireboot"
+REBOOT="@INITRD_RECOVERY_LIBEXEC_DIR@/minireboot"
 SYNC="/usr/bin/sync"
 TOUCH="/usr/bin/touch"
 UMOUNT="/usr/bin/umount"

diff --git a/src/system-recovery/recovery-rui.c b/src/system-recovery/recovery-rui.c
index 5b3cfc0..dbf4b91 100644 (file)
--- a/src/system-recovery/recovery-rui.c
+++ b/src/system-recovery/recovery-rui.c
@@ -22,6 +22,7 @@
 
 #include "rui.h"
 #include "common.h"
+#include "config.h"
 #include "rui-menu.h"
 #include "graphics.h"
 #include "rui-image.h"
@@ -34,7 +35,7 @@
 
 static rui_image rui_images[] = {
        [RECOVERY_RUI_IMAGE_BACKGROUND_DEFAULT] = {
-               .fname          = RUI_RECOVERY_IMAGES_DIR "/warning.png",
+               .fname          = SYSTEM_RECOVERY_IMAGE_DIR "/warning.png",
                .c_bg           = RUI_COLOR_BACKGROUND,
                .align_hor      = GR_ALIGN_CENTER,
                .align_ver      = GR_ALIGN_BOTTOM,
@@ -44,7 +45,7 @@ static rui_image rui_images[] = {
                .surface        = NULL
        },
        [RECOVERY_RUI_IMAGE_MENU_TITLE] = {
-               .fname          = RUI_RECOVERY_IMAGES_DIR "/menu-title.png",
+               .fname          = SYSTEM_RECOVERY_IMAGE_DIR "/menu-title.png",
                .c_bg           = RUI_COLOR_TITLE,
                .align_hor      = GR_ALIGN_CENTER,
                .align_ver      = GR_ALIGN_TOP,
@@ -57,7 +58,7 @@ static rui_image rui_images[] = {
 
 static rui_animation rui_animations[] = {
        [RECOVERY_RUI_ANIMATION_WORKING] = {
-               .fname          = RUI_RECOVERY_IMAGES_DIR "/tizen-anim.png",
+               .fname          = SYSTEM_RECOVERY_IMAGE_DIR "/tizen-anim.png",
                .c_bg           = RUI_COLOR_BACKGROUND,
                .align_hor      = GR_ALIGN_CENTER,
                .align_ver      = GR_ALIGN_MIDDLE,

diff --git a/src/system-recovery/system-recovery.h b/src/system-recovery/system-recovery.h
index 4966662..196763c 100644 (file)
--- a/src/system-recovery/system-recovery.h
+++ b/src/system-recovery/system-recovery.h
@@ -35,8 +35,6 @@ extern "C" {
 #define INITRD_MOUNT_DIR        "/system/mnt/initrd-recovery"
 #define FACTORY_RESET           "/usr/bin/factory-reset"
 
-#define RUI_RECOVERY_IMAGES_DIR "/usr/lib/system-recovery/res/images"
-
 typedef enum {
        RECOVERY_RUI_SCREEN_MAIN,
        RECOVERY_RUI_SCREEN_REBOOT,