NorwayFun
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

edje: change epp installdir 

SVN revision: 57252
This commit is contained in:
Mike Blumenkrantz 2011-02-23 02:51:32 +00:00
parent 1a2574ee77
commit 299e2d9208
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
legacy/edje/configure.ac
View File

@ -294,12 +294,9 @@ if test "x$have_edje_cc" = "xyes"; then
PKG_CHECK_MODULES([EDJE_CC], [ecore-file >= 1.0.0 ecore-evas >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eet >= 1.0.0 eina >= 1.0.0]) PKG_CHECK_MODULES([EDJE_CC], [ecore-file >= 1.0.0 ecore-evas >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eet >= 1.0.0 eina >= 1.0.0])
EDJE_CC_LIBS="${EDJE_CC_LIBS} ${LUA_LIBS} ${lua_libs}" EDJE_CC_LIBS="${EDJE_CC_LIBS} ${LUA_LIBS} ${lua_libs}"
fi fi
AC_PATH_PROG([EPP], [epp]) AM_CONDITIONAL([BUILD_EPP], [test "x$have_edje_cc" = "xyes"])
AM_CONDITIONAL([BUILD_EPP], [test "x$have_edje_cc" = "xyes" -a -z "$EPP"]) EPPDIR=${prefix}/lib/edje/utils
if test -z "$EPP" ; then AC_SUBST(EPPDIR)
EPP=${prefix}/bin/epp
AC_SUBST(EPP)
fi
if test "x$have_edje_decc" = "xyes"; then if test "x$have_edje_decc" = "xyes"; then
PKG_CHECK_MODULES([EDJE_DECC], [ecore-file >= 1.0.0 ecore-evas >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eet >= 1.0.0 eina >= 1.0.0]) PKG_CHECK_MODULES([EDJE_DECC], [ecore-file >= 1.0.0 ecore-evas >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eet >= 1.0.0 eina >= 1.0.0])

4
legacy/edje/src/bin/edje_cc_parse.c.in
View File

@ -693,9 +693,9 @@ compile(void)
* Run the input through the C pre-processor. * Run the input through the C pre-processor.
*/ */
ret = -1; ret = -1;
if (ecore_file_exists("@EPP@")) if (ecore_file_exists("@EPPDIR@/epp"))
{ {
snprintf(buf, sizeof(buf), "@EPP@ -I%s %s -P -o %s - < %s", snprintf(buf, sizeof(buf), "@EPPDIR@/epp -I%s %s -P -o %s - < %s",
inc, def, tmpn, file_in); inc, def, tmpn, file_in);
ret = system(buf); ret = system(buf);
} }

3
legacy/edje/src/bin/epp/Makefile.am
View File

@ -18,7 +18,8 @@
#the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. #the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
bin_PROGRAMS = epp eppdir = @EPPDIR@
epp_PROGRAMS = epp
epp_SOURCES = \ epp_SOURCES = \
cpplib.h \ cpplib.h \