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: http://svn.enlightenment.org/svn/e/trunk/edje@57284
7cbeb6ba-43b4-40fd-8cce-
4c39aea84d33
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])
+MAINTAINERCLEANFILES = Makefile.in
+
if BUILD_EPP
SUBDIRS = epp
endif
-MAINTAINERCLEANFILES = Makefile.in
bin_SCRIPTS = @EDJE_RECC_PRG@
-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@
* 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
#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 \