Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/embryo
Dir : e17/libs/embryo/src/bin
Modified Files:
Makefile.am embryo_cc_sc1.c
Added Files:
embryo_cc_prefix.c embryo_cc_prefix.h
Log Message:
add prefix detection to embryo
===================================================================
RCS file: /cvs/e/e17/libs/embryo/src/bin/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Makefile.am 13 Apr 2005 19:52:55 -0000 1.4
+++ Makefile.am 10 Jul 2006 18:31:18 -0000 1.5
@@ -23,7 +23,9 @@
embryo_cc_sc7.c \
embryo_cc_scexpand.c \
embryo_cc_sclist.c \
-embryo_cc_scvars.c
+embryo_cc_scvars.c \
+embryo_cc_prefix.c \
+embryo_cc_prefix.h
embryo_cc_LDADD =
embryo_cc_DEPENDENCIES =
===================================================================
RCS file: /cvs/e/e17/libs/embryo/src/bin/embryo_cc_sc1.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- embryo_cc_sc1.c 4 Nov 2005 08:16:24 -0000 1.31
+++ embryo_cc_sc1.c 10 Jul 2006 18:31:18 -0000 1.32
@@ -21,7 +21,7 @@
* must not be misrepresented as being the original software.
* 3. This notice may not be removed or altered from any source
* distribution.
- * Version: $Id: embryo_cc_sc1.c,v 1.31 2005/11/04 08:16:24 sebastid Exp $
+ * Version: $Id: embryo_cc_sc1.c,v 1.32 2006/07/10 18:31:18 raster Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -38,6 +38,7 @@
#include <unistd.h>
#include "embryo_cc_osdefs.h"
#include "embryo_cc_sc.h"
+#include "embryo_cc_prefix.h"
#define VERSION_STR "2.4"
#define VERSION_INT 240
@@ -135,6 +136,8 @@
snprintf(argv0, _MAX_PATH, "%s/%s", pwd, argv[0]);
} /* if */
argv[0] = argv0; /* set location to new first parameter */
+
+ e_prefix_determine(argv0);
return sc_compile(argc, argv);
}
@@ -592,8 +595,9 @@
size_t len;
/* use embryo include dir always */
- insert_path(PACKAGE_DATA_DIR "/include/");
- insert_path(PACKAGE_DATA_DIR "./");
+ snprintf(str, sizeof(str), "%s/include/", e_prefix_data_get());
+ insert_path(str);
+ insert_path("./");
for (i = 1; i < argc; i++)
{
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
