From owner-p4-projects@FreeBSD.ORG  Fri Sep  5 14:37:00 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D9E3C16A4C1; Fri,  5 Sep 2003 14:36:59 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9C6AD16A4BF
	for <perforce@freebsd.org>; Fri,  5 Sep 2003 14:36:59 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0BE2D43FD7
	for <perforce@freebsd.org>; Fri,  5 Sep 2003 14:36:59 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h85Law0U062479
	for <perforce@freebsd.org>; Fri, 5 Sep 2003 14:36:58 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h85LawGu062476
	for perforce@freebsd.org; Fri, 5 Sep 2003 14:36:58 -0700 (PDT)
Date: Fri, 5 Sep 2003 14:36:58 -0700 (PDT)
Message-Id: <200309052136.h85LawGu062476@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 37589 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Sep 2003 21:37:00 -0000

http://perforce.freebsd.org/chv.cgi?CH=37589

Change 37589 by peter@peter_daintree on 2003/09/05 14:36:45

	Check in jdp's patches in the 1.1 port.  I believe these are ezm3-1.1a

Affected files ...

.. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/Makefile.in#2 edit
.. //depot/projects/ezm3/language/modula3/m3compiler/m3ship/src/Main.m3#2 edit

Differences ...

==== //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/gcc/Makefile.in#2 (text+ko) ====

@@ -690,8 +690,8 @@
 	-e 's|%% *|../|g' \
 	-e 's|%||g'
 SUBDIR_FLAGS_TO_PASS = $(ORDINARY_FLAGS_TO_PASS) \
-	"CC=`echo @quoted_cc_set_by_configure@ | $(PREPEND_DOTDOT_TO_RELATIVE_PATHS)`" \
-	"STAGE_PREFIX=`echo @quoted_stage_prefix_set_by_configure@ | $(PREPEND_DOTDOT_TO_RELATIVE_PATHS)`"
+	"CC=`echo @quoted_cc_set_by_configure@ | $(PREPEND_DOTDOT_TO_RELATIVE_PATHS)`"
+
 #
 # Lists of files for various purposes.
 

==== //depot/projects/ezm3/language/modula3/m3compiler/m3ship/src/Main.m3#2 (text+ko) ====

@@ -303,9 +303,10 @@
     m3_template := Env.Get("M3_TEMPLATE_DIR");
     path        : TEXT;
     subpath     : TEXT;
-    nextsep     : INTEGER := 0;
-    prevsep     : INTEGER := 0;
+    nextsep     : INTEGER;
+    prevsep     : INTEGER := -1;
     sep         : CHAR;
+    filename    : TEXT;
   BEGIN
     IF m3_template # NIL THEN
       template_dir := m3_template;
@@ -322,13 +323,17 @@
       REPEAT
         nextsep := Text.FindChar(path, sep, prevsep + 1);
         IF nextsep # -1 THEN
-          subpath := Text.Sub(path, prevsep, nextsep - prevsep - 1);
+          subpath := Text.Sub(path, prevsep + 1, nextsep - prevsep - 1);
         ELSE
-          subpath := Text.Sub(path, prevsep);
+          subpath := Text.Sub(path, prevsep + 1);
         END;
-        IF M3File.IsReadable(subpath & template) THEN
-          template_dir := subpath;
-          RETURN;
+        IF Text.Length(subpath) > 0 THEN
+          filename := subpath & SL & template;
+          IF M3File.IsReadable(filename) AND
+            NOT M3File.IsDirectory(filename) THEN
+            template_dir := subpath;
+            RETURN;
+          END;
         END;
         prevsep := nextsep;
       UNTIL prevsep = -1;