diff --git a/legacy/ecore/configure.in b/legacy/ecore/configure.in index 352662c872..908f9cb963 100644 --- a/legacy/ecore/configure.in +++ b/legacy/ecore/configure.in @@ -17,39 +17,6 @@ AC_CHECK_SIZEOF(long, 4) AM_ENABLE_SHARED AM_PROG_LIBTOOL AC_C___ATTRIBUTE__ - -if test "x${bindir}" = 'x${exec_prefix}/bin'; then - if test "x${exec_prefix}" = "xNONE"; then - if test "x${prefix}" = "xNONE"; then - bindir="${ac_default_prefix}/bin"; - else - bindir="${prefix}/bin"; - fi - else - if test "x${prefix}" = "xNONE"; then - bindir="${ac_default_prefix}/bin"; - else - bindir="${prefix}/bin"; - fi - fi -fi - -if test "x${libdir}" = 'x${exec_prefix}/lib'; then - if test "x${exec_prefix}" = "xNONE"; then - if test "x${prefix}" = "xNONE"; then - libdir="${ac_default_prefix}/lib"; - else - libdir="${prefix}/lib"; - fi - else - if test "x${prefix}" = "xNONE"; then - libdir="${ac_default_prefix}/lib"; - else - libdir="${prefix}/lib"; - fi - fi -fi - dnl Set PACKAGE_DATA_DIR in config.h. if test "x${prefix}" = "xNONE"; then diff --git a/legacy/edje/configure.in b/legacy/edje/configure.in index 724859b520..824a5d5b06 100644 --- a/legacy/edje/configure.in +++ b/legacy/edje/configure.in @@ -33,38 +33,6 @@ if test "x$res" = "xno"; then fi AC_SUBST(fnmatch_libs) - -if test "x${bindir}" = 'x${exec_prefix}/bin'; then - if test "x${exec_prefix}" = "xNONE"; then - if test "x${prefix}" = "xNONE"; then - bindir="${ac_default_prefix}/bin"; - else - bindir="${prefix}/bin"; - fi - else - if test "x${prefix}" = "xNONE"; then - bindir="${ac_default_prefix}/bin"; - else - bindir="${prefix}/bin"; - fi - fi -fi - -if test "x${libdir}" = 'x${exec_prefix}/lib'; then - if test "x${exec_prefix}" = "xNONE"; then - if test "x${prefix}" = "xNONE"; then - libdir="${ac_default_prefix}/lib"; - else - libdir="${prefix}/lib"; - fi - else - if test "x${prefix}" = "xNONE"; then - libdir="${ac_default_prefix}/lib"; - else - libdir="${prefix}/lib"; - fi - fi -fi dnl Set PACKAGE_DATA_DIR in config.h. if test "x${prefix}" = "xNONE"; then diff --git a/legacy/edje/src/bin/edje_cc_out.c b/legacy/edje/src/bin/edje_cc_out.c index 3c0c08e4cd..0f79a78f37 100644 --- a/legacy/edje/src/bin/edje_cc_out.c +++ b/legacy/edje/src/bin/edje_cc_out.c @@ -623,9 +623,8 @@ data_write(void) if (fd >= 0) { snprintf(buf, sizeof(buf), - "embryo_cc -i %s -o %s %s", - "%s/include", tmpo, tmpn, - e_prefix_data_get()); + "embryo_cc -i %s/include -o %s %s", + e_prefix_data_get(), tmpo, tmpn); ret = system(buf); /* accept warnings in the embryo code */ if (ret < 0 || ret > 1) diff --git a/legacy/eet/configure.in b/legacy/eet/configure.in index 23fd2aa104..7e1da635b9 100644 --- a/legacy/eet/configure.in +++ b/legacy/eet/configure.in @@ -86,36 +86,11 @@ Solaris 10)]) ], AC_MSG_WARN([Cannot check when cross-compiling -- assuming C99 '%a' support is OK]) ) -if test "x${bindir}" = 'x${exec_prefix}/bin'; then - if test "x${exec_prefix}" = "xNONE"; then - if test "x${prefix}" = "xNONE"; then - bindir="${ac_default_prefix}/bin"; - else - bindir="${prefix}/bin"; - fi - else - if test "x${prefix}" = "xNONE"; then - bindir="${ac_default_prefix}/bin"; - else - bindir="${prefix}/bin"; - fi - fi -fi - -if test "x${libdir}" = 'x${exec_prefix}/lib'; then - if test "x${exec_prefix}" = "xNONE"; then - if test "x${prefix}" = "xNONE"; then - libdir="${ac_default_prefix}/lib"; - else - libdir="${prefix}/lib"; - fi - else - if test "x${prefix}" = "xNONE"; then - libdir="${ac_default_prefix}/lib"; - else - libdir="${prefix}/lib"; - fi - fi +dnl Set PACKAGE_DATA_DIR in config.h. +if test "x${prefix}" = "xNONE"; then + AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [Shared Data Directory]) +else + AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared Data Directory]) fi dnl Set PACKAGE_BIN_DIR in config.h. diff --git a/legacy/embryo/configure.in b/legacy/embryo/configure.in index 83f3104b51..6e272fc3e0 100644 --- a/legacy/embryo/configure.in +++ b/legacy/embryo/configure.in @@ -33,38 +33,6 @@ fi AC_SUBST(fnmatch_libs) -if test "x${bindir}" = 'x${exec_prefix}/bin'; then - if test "x${exec_prefix}" = "xNONE"; then - if test "x${prefix}" = "xNONE"; then - bindir="${ac_default_prefix}/bin"; - else - bindir="${prefix}/bin"; - fi - else - if test "x${prefix}" = "xNONE"; then - bindir="${ac_default_prefix}/bin"; - else - bindir="${prefix}/bin"; - fi - fi -fi - -if test "x${libdir}" = 'x${exec_prefix}/lib'; then - if test "x${exec_prefix}" = "xNONE"; then - if test "x${prefix}" = "xNONE"; then - libdir="${ac_default_prefix}/lib"; - else - libdir="${prefix}/lib"; - fi - else - if test "x${prefix}" = "xNONE"; then - libdir="${ac_default_prefix}/lib"; - else - libdir="${prefix}/lib"; - fi - fi -fi - dnl Set PACKAGE_DATA_DIR in config.h. if test "x${prefix}" = "xNONE"; then AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [Shared Data Directory]) diff --git a/legacy/evas/configure.in b/legacy/evas/configure.in index 3d591dc55b..6df1800f76 100644 --- a/legacy/evas/configure.in +++ b/legacy/evas/configure.in @@ -1,4 +1,4 @@ -# get rid of that stupid cache mechanism +bn# get rid of that stupid cache mechanism rm -f config.cache AC_INIT(configure.in) @@ -23,38 +23,6 @@ AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture") dnl Add the languages which your application supports here. -if test "x${bindir}" = 'x${exec_prefix}/bin'; then - if test "x${exec_prefix}" = "xNONE"; then - if test "x${prefix}" = "xNONE"; then - bindir="${ac_default_prefix}/bin"; - else - bindir="${prefix}/bin"; - fi - else - if test "x${prefix}" = "xNONE"; then - bindir="${ac_default_prefix}/bin"; - else - bindir="${prefix}/bin"; - fi - fi -fi - -if test "x${libdir}" = 'x${exec_prefix}/lib'; then - if test "x${exec_prefix}" = "xNONE"; then - if test "x${prefix}" = "xNONE"; then - libdir="${ac_default_prefix}/lib"; - else - libdir="${prefix}/lib"; - fi - else - if test "x${prefix}" = "xNONE"; then - libdir="${ac_default_prefix}/lib"; - else - libdir="${prefix}/lib"; - fi - fi -fi - dnl Set PACKAGE_DATA_DIR in config.h. if test "x${prefix}" = "xNONE"; then AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [Shared Data Directory])