Subject: Re: [E-devel] E SVN: discomfitor trunk/edje/src/bin

Date: Wed, 23 Feb 2011 20:25:38 +0100 (CET)

On Wed, 23 Feb 2011, Mike Blumenkrantz wrote:
> vtorri! help!!!! :(

try the attached patch

Vincent

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@57284 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/configure.ac b/configure.ac
index 724f960..0f377ed 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -295,8 +295,8 @@ 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])
    EDJE_CC_LIBS="${EDJE_CC_LIBS} ${LUA_LIBS} ${lua_libs}"
 fi
+
 AM_CONDITIONAL([BUILD_EPP], [test "x$have_edje_cc" = "xyes"])
-AC_DEFINE_UNQUOTED([EPPDIR], ["${libdir}/${PACKAGE}/utils"], [directory where epp will be installed])
 
 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])

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index a08f599..e559f7f 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -1,7 +1,8 @@
+MAINTAINERCLEANFILES = Makefile.in
+
 if BUILD_EPP
   SUBDIRS = epp
 endif
-MAINTAINERCLEANFILES = Makefile.in
 
 bin_SCRIPTS = @EDJE_RECC_PRG@
 
@@ -24,6 +25,7 @@ edje_cc_CPPFLAGS = \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
+-DEPP_DIR=\"$(libdir)/$(PACKAGE)/utils\" \
 @EDJE_CFLAGS@ @EDJE_CC_CFLAGS@ @EVIL_CFLAGS@
 edje_cc_LDADD = $(top_builddir)/src/lib/libedje.la @EDJE_CC_LIBS@ @EVIL_LIBS@ -lm
 edje_cc_LDFLAGS = @lt_enable_auto_import@

diff --git a/src/bin/edje_cc_parse.c b/src/bin/edje_cc_parse.c
index ab80967..a9fd2fb 100644 (file)
--- a/src/bin/edje_cc_parse.c
+++ b/src/bin/edje_cc_parse.c
@@ -693,12 +693,12 @@ compile(void)
         * Run the input through the C pre-processor.
         */
         ret = -1;
-   if (ecore_file_exists(EPPDIR"/epp"))
-     {
-        snprintf(buf, sizeof(buf), EPPDIR"/epp -I%s %s -P -o %s - < %s",
-                 inc, def, tmpn, file_in);
-         ret = system(buf);
-     }
+        if (ecore_file_exists(EPP_DIR"/epp"))
+          {
+             snprintf(buf, sizeof(buf), EPP_DIR"/epp -I%s %s -P -o %s - < %s",
+                      inc, def, tmpn, file_in);
+             ret = system(buf);
+          }
        /*
         * On OpenSolaris, the default cpp is located in different places.
         * Alan Coppersmith told me to do what xorg does: using /usr/ccs/lib/cpp

diff --git a/src/bin/epp/Makefile.am b/src/bin/epp/Makefile.am
index f7f11be..2d3f3aa 100644 (file)
--- a/src/bin/epp/Makefile.am
+++ b/src/bin/epp/Makefile.am
@@ -18,20 +18,24 @@
 #the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 MAINTAINERCLEANFILES = Makefile.in
+
 eppdir = @libdir@/@PACKAGE@/utils
+
 epp_PROGRAMS = epp
 
 epp_SOURCES = \
-       cpplib.h \
-       cpphash.h \
-       cppalloc.c \
-       cpperror.c \
-       cppexp.c \
-       cpphash.c \
-       cpplib.c \
-       cppmain.c 
-
-epp_CPPFLAGS = -I$(top_builddir) $(CWARNFLAGS)
+cpplib.h \
+cpphash.h \
+cppalloc.c \
+cpperror.c \
+cppexp.c \
+cpphash.c \
+cpplib.c \
+cppmain.c
+
+epp_CPPFLAGS = \
+-I$(top_builddir) \
+$(CWARNFLAGS)
 
 DEFS= \
 -DHAVE_STRERROR \