diff --git a/legacy/edje/src/examples/Makefile.am b/legacy/edje/src/examples/Makefile.am
index a4ba23a22f..210d4ba7ad 100644
--- a/legacy/edje/src/examples/Makefile.am
+++ b/legacy/edje/src/examples/Makefile.am
@@ -8,47 +8,47 @@ EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_$(V)) -id $(srcdir) -fd $(srcdir)
 EDJE_CODEGEN = @edje_codegen@
 EDJE_CODEGEN_FLAGS = --prefix=codegen_example
 
-examplesdir = $(datadir)/$(PACKAGE)/examples
+examplesdir = $(pkgdatadir)/examples
 
 if ENABLE_MULTISENSE
-MULTISENSE_BIN_FILE = edje-multisense
-MULTISENSE_C_FILE   = edje-multisense.c
-MULTISENSE_EDC_FILE = multisense.edc
 SND_DIR             = -sd $(srcdir)
 endif
 
 #put here all EDCs one needs to the examples
 EDCS = \
-        basic.edc \
-	swallow.edc \
-	text.edc \
-	table.edc \
-	box.edc \
-	codegen.edc \
-	drag.edc \
-	edje_example.edc \
-	embryo_custom_state.edc \
-	embryo_pong.edc \
-	embryo_run_program.edc \
-	embryo_set_state.edc \
-	embryo_set_text.edc \
-	embryo_timer.edc \
-	external_elm_anchorblock.edc \
-	external_elm_button.edc \
-	external_elm_check.edc \
-	external_elm_panes.edc \
-	external_emotion_elm.edc \
-	toggle_using_filter.edc \
-	signals-messages.edc \
-	color-class.edc \
-	perspective.edc \
-	animations.edc \
-	lua_script.edc \
-	sigtest.edc \
-	animations2.edc \
-	basic2.edc \
-	signalsBubble.edc \
-	$(MULTISENSE_EDC_FILE)
+basic.edc \
+swallow.edc \
+text.edc \
+table.edc \
+box.edc \
+codegen.edc \
+drag.edc \
+edje_example.edc \
+embryo_custom_state.edc \
+embryo_pong.edc \
+embryo_run_program.edc \
+embryo_set_state.edc \
+embryo_set_text.edc \
+embryo_timer.edc \
+external_elm_anchorblock.edc \
+external_elm_button.edc \
+external_elm_check.edc \
+external_elm_panes.edc \
+external_emotion_elm.edc \
+toggle_using_filter.edc \
+signals-messages.edc \
+color-class.edc \
+perspective.edc \
+animations.edc \
+lua_script.edc \
+sigtest.edc \
+animations2.edc \
+basic2.edc \
+signalsBubble.edc
+
+if ENABLE_MULTISENSE
+EDCS += multisense.edc
+endif
 
 .edc.edj:
 	$(EDJE_CC) $(EDJE_CC_FLAGS) $(SND_DIR) $< $(builddir)/$(@F)
@@ -56,33 +56,36 @@ EDCS = \
 
 EDJS = $(EDCS:%.edc=%.edj)
 
-filesdir = $(datadir)/$(PACKAGE)/examples
+filesdir = $(pkgdatadir)/examples
 files_DATA = \
-        $(EDCS) \
-        bubble.png \
-	red.png \
-	test.png \
-	Vera.ttf \
-        duck.wav \
-	edje-codegen-example.c \
-	edje_example.c \
-	edje-basic.c \
-	edje-swallow.c \
-	edje-text.c \
-	edje-table.c \
-	edje-box.c \
-	edje-box2.c \
-	edje-drag.c \
-	edje-signals-messages.c \
-	edje-color-class.c \
-	edje-perspective.c \
-	edje-animations.c \
-	sigtest.c \
-	animations2.c \
-	edje-basic2.c \
-	signals2.c \
-	edje-swallow2.c \
-	$(MULTISENSE_C_FILE)
+$(EDCS) \
+bubble.png \
+red.png \
+test.png \
+Vera.ttf \
+duck.wav \
+edje-codegen-example.c \
+edje_example.c \
+edje-basic.c \
+edje-swallow.c \
+edje-text.c \
+edje-table.c \
+edje-box.c \
+edje-box2.c \
+edje-drag.c \
+edje-signals-messages.c \
+edje-color-class.c \
+edje-perspective.c \
+edje-animations.c \
+sigtest.c \
+animations2.c \
+edje-basic2.c \
+signals2.c \
+edje-swallow2.c
+
+if ENABLE_MULTISENSE
+files_DATA += edje-multisense.c
+endif
 
 EXTRA_DIST = $(files_DATA)
 
@@ -107,24 +110,27 @@ edje_codegen_example_SOURCES = \
 files_DATA += $(EDJS)
 
 examples_PROGRAMS = \
-	edje-animations \
-	edje-basic \
-	edje-box \
-	edje-box2 \
-	edje-codegen-example \
-	edje-color-class \
-	edje-drag\
-	edje-perspective \
-	edje-signals-messages \
-	edje-swallow \
-	edje-table \
-	edje-text \
-	sigtest \
-	animations2 \
-	edje-basic2 \
-	signals2 \
-	edje-swallow2 \
-	$(MULTISENSE_BIN_FILE)
+edje-animations \
+edje-basic \
+edje-box \
+edje-box2 \
+edje-codegen-example \
+edje-color-class \
+edje-drag\
+edje-perspective \
+edje-signals-messages \
+edje-swallow \
+edje-table \
+edje-text \
+sigtest \
+animations2 \
+edje-basic2 \
+signals2 \
+edje-swallow2
+
+if ENABLE_MULTISENSE
+examples_PROGRAMS += edje-multisense
+endif
 
 LDADD = $(top_builddir)/src/lib/libedje.la @EDJE_LIBS@