--- a/stage1_2/iec.flex	Wed Jul 11 09:53:27 2007 +0200
+++ b/stage1_2/iec.flex	Thu Jul 12 11:24:32 2007 +0200
@@ -101,7 +101,7 @@
  * in the syntax parser header file...
  */
 #ifdef TEST_MAIN
-#define LIBDIRECTORY "just_testing"
+#define DEFAULT_LIBDIR "just_testing"
 #endif
 
 
@@ -347,12 +347,11 @@
 int include_stack_ptr = 0;
 
 const char *INCLUDE_DIRECTORIES[] = {
-	"",
-	"lib/",
-	"/lib/",
-	"/usr/lib/",
-	"/usr/lib/iec/",
-	LIBDIRECTORY "/",
+	DEFAULT_LIBDIR,
+	".",
+	"/lib",
+	"/usr/lib",
+	"/usr/lib/iec",
 	NULL /* must end with NULL!! */
 	};
 
@@ -666,7 +665,7 @@
 			  current_filename = strdup(yytext);
 
 			  for (i = 0, yyin = NULL; (INCLUDE_DIRECTORIES[i] != NULL) && (yyin == NULL); i++) {
-			    char *full_name = strdup2(INCLUDE_DIRECTORIES[i], yytext);
+			    char *full_name = strdup3(INCLUDE_DIRECTORIES[i], "/", yytext);
 			    if (full_name == NULL) {
 			      fprintf(stderr, "Out of memory!\n");
 			      exit( 1 );