RE: [PATCH] xc/config/imake/Makefile.ini

[Harold Hunt <Harold at compasstechnologies dot com>]

Suhaib,

I just pulled a brand new tree from XFree86 and my patch for
xc/config/imake/Makefile.ini was not applied, and I can see why.  The patch
I originally submitted would have freaked out on normal Unix platforms, as
make would exit as soon as it couldn't find imake.exe.  Here is a new patch
that checks for imake.exe and imake within an if elif else structure.  I
believe that this patch will work on normal Unix platforms, and I have
verified that it works on Cygwin.

Index: Makefile.ini
===================================================================
RCS file: /cvs/xc/config/imake/Makefile.ini,v
retrieving revision 3.8
diff -r3.8 Makefile.ini
43,44c43
<       @if [ -f imake ]; then set -x; $(MV) imake bootstrap; else exit 0;
fi
<       @if [ -f imake.exe ]; then set -x; $(MV) imake.exe bootstrap; else
exit
0; fi
---
>       @if [ -f imake.exe ]; then set -x; $(MV) imake.exe bootstrap; elif [
-f
imake ]; then set -x; $(MV) imake bootstrap; else exit 0; fi

Harold



-----Original Message-----
From: Harold Hunt [mailto:Harold@compasstechnologies.com]
Sent: Tuesday, October 03, 2000 9:47 AM
To: 'ssiddiqi@inspirepharm.com'; Cygx (E-mail)
Subject: [PATCH] xc/config/imake/Makefile.ini


Suhaib,
I was wondering if you forwarded this patch on to the XFree86 people, or if
you could point me in the right direction to send it myself.  
The patch is needed because Cygwin, by design, returns true to a search for
file 'imake' when a file named 'imake.exe' exists, even though a file named
'imake' does not exist.  Applying this patch fixes the build bustage when
the bootstrapping steps attempt to move file 'imake' that does not exist.
Harold

Index: Makefile.ini
===================================================================
RCS file: /cvs/xc/config/imake/Makefile.ini,v
retrieving revision 3.8
diff -p -3 -r3.8 Makefile.ini
*** Makefile.ini        2000/08/26 15:28:32     3.8
--- Makefile.ini        2000/10/02 03:12:29
*************** ccimake: ccimake.c
*** 40,47 ****
  bootstrap:
        -@if [ -d bootstrap ]; then exit 0; else set -x; mkdir bootstrap; fi
        $(MV) *.o bootstrap
-       @if [ -f imake ]; then set -x; $(MV) imake bootstrap; else exit 0;
fi
        @if [ -f imake.exe ]; then set -x; $(MV) imake.exe bootstrap; else
exit 0; fi

  relink:
        $(RM) imake
--- 40,47 ----
  bootstrap:
        -@if [ -d bootstrap ]; then exit 0; else set -x; mkdir bootstrap; fi
        $(MV) *.o bootstrap
        @if [ -f imake.exe ]; then set -x; $(MV) imake.exe bootstrap; else
exit 0; fi
+       @if [ -f imake ]; then set -x; $(MV) imake bootstrap; else exit 0;
fi

  relink:
        $(RM) imake