diff --git a/configure b/configure
index 249705ec..ad115edc 100755
--- a/configure
+++ b/configure
@@ -4305,9 +4305,6 @@ case $WITH_TARGET in
 	if test "X$SBINDIR" = X; then
 		SBINDIR="$prefix/sbin"
 	fi
-	if test "X$ETCDIR" = X; then
-		ETCDIR="$prefix/etc"
-	fi
 	if test "X$KMODDIR" = X; then
 		KMODDIR="$prefix/kmod"
 	fi
@@ -4334,6 +4331,9 @@ case $WITH_TARGET in
 	if test "X$INCDIR" = X; then
 		INCDIR="$prefix/include"
 	fi
+	if test "X$ETCDIR" = X; then
+		ETCDIR="$prefix/etc"
+	fi
 	if test "X$KMODDIR" = X; then
 		KMODDIR="$prefix/kmod"
 	fi
@@ -4360,6 +4360,9 @@ case $WITH_TARGET in
 	if test "X$INCDIR" = X; then
 		INCDIR="$prefix/include"
 	fi
+	if test "X$ETCDIR" = X; then
+		ETCDIR="$prefix/etc"
+	fi
 	if test "X$KMODDIR" = X; then
 		KMODDIR="$prefix/kmod"
 	fi
@@ -4775,7 +4778,7 @@ case $ENABLE_MEMDUMP in
 	default)
 # POSTK_DEBUG_ARCH_DEP_30, Expansion of the branch.
 #		if test "x$WITH_TARGET" = "xsmp-x86" ; then
-		if test "x$WITH_TARGET" = "xsmp-*" ; then
+		if test "x$WITH_TARGET" = "xsmp-x86" -o "x$WITH_TARGET" = "xsmp-arm64" ; then
 			ENABLE_MEMDUMP=auto
 		else
 			ENABLE_MEMDUMP=no
diff --git a/configure.ac b/configure.ac
index 6ee43e85..b3c6b4b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -255,9 +255,6 @@ case $WITH_TARGET in
 	if test "X$SBINDIR" = X; then
 		SBINDIR="$prefix/sbin"
 	fi
-	if test "X$ETCDIR" = X; then
-		ETCDIR="$prefix/etc"
-	fi
 	if test "X$KMODDIR" = X; then
 		KMODDIR="$prefix/kmod"
 	fi
@@ -284,6 +281,9 @@ case $WITH_TARGET in
 	if test "X$INCDIR" = X; then
 		INCDIR="$prefix/include"
 	fi
+	if test "X$ETCDIR" = X; then
+		ETCDIR="$prefix/etc"
+	fi
 	if test "X$KMODDIR" = X; then
 		KMODDIR="$prefix/kmod"
 	fi
@@ -310,6 +310,9 @@ case $WITH_TARGET in
 	if test "X$INCDIR" = X; then
 		INCDIR="$prefix/include"
 	fi
+	if test "X$ETCDIR" = X; then
+		ETCDIR="$prefix/etc"
+	fi
 	if test "X$KMODDIR" = X; then
 		KMODDIR="$prefix/kmod"
 	fi
@@ -404,7 +407,7 @@ case $ENABLE_MEMDUMP in
 	default)
 # POSTK_DEBUG_ARCH_DEP_30, Expansion of the branch.
 #		if test "x$WITH_TARGET" = "xsmp-x86" ; then
-		if test "x$WITH_TARGET" = "xsmp-*" ; then
+		if test "x$WITH_TARGET" = "xsmp-x86" -o "x$WITH_TARGET" = "xsmp-arm64" ; then
 			ENABLE_MEMDUMP=auto
 		else
 			ENABLE_MEMDUMP=no
diff --git a/executer/user/Makefile.in b/executer/user/Makefile.in
index e39c566b..e35ca76b 100644
--- a/executer/user/Makefile.in
+++ b/executer/user/Makefile.in
@@ -38,7 +38,7 @@ mcexec: mcexec.c libmcexec.a
 #eclair: eclair.c
 #	$(CC) $(CFLAGS) -I${IHKDIR} -o $@ $^ $(LIBS)
 eclair: eclair.c arch/$(ARCH)/arch-eclair.c
-	$(CC) -I.. -I. -I./arch/$(ARCH)/include -I${IHKDIR} $(CFLAGS) -o $@ $^ $(LIBS)
+	$(CC) -I.. -I. -I./arch/$(ARCH)/include -I$(VPATH)/.. -I$(VPATH) -I$(VPATH)/arch/$(ARCH)/include -I${IHKDIR} $(CFLAGS) -o $@ $^ $(LIBS)
 
 libsched_yield: libsched_yield.c
 	$(CC) -shared -fPIC -Wl,-soname,sched_yield.so.1 -o libsched_yield.so.1.0.0 $^ -lc -ldl