Patch for config/makefile.mgw

[<tim...@en...>]

Hi !

I have used makefile.mgw for some time now to build my snapshots includin=
g
the wxWidgets terminal. I use it with MSYS/MinGW. MSYS (part of the MinGW
project) provides the shell and the translations between unix paths and
windows paths.

Each time I use a freshly downloaded version from the CVS, I have to make
the following modifications to make it succeed. I hope they could be
included in the CVS version, in the case this makefile is supposed to be
used with MSYS as I use it :

--- makefile.mgw
+++ /mnt/fat/gnuplot-cvs2/config/makefile.mgw
@@ -104,7 +104,7 @@
 # To compile the .hlp file you need hcw either out of Microsoft SDK or M=
S
Help
 # Workshop. The latter can be obtained at
www.helpmaster.com/help/devaids.htm.
 # Put the path to hcw here unless it is already in PATH:
-#HCWPATH =3D /Program\ Files/Help\ Workshop/
+#HCWPATH =3D /c/Program\ Files/Help\ Workshop/
 #HCWPATH =3D h:/mssdk/bin/
 HCW =3D $(HCWPATH)hcw
 # Switches are for HCW 4.03:

MSYS uses by default /[Drive letter] as the root directory for the
translation of the windows paths.


@@ -170,7 +170,7 @@
 ifdef GD
   CFLAGS +=3D -DHAVE_LIBGD
-  TERMLIBS +=3D -lgd
+  TERMLIBS +=3D -lbgd
 endif

 ifdef GIF


The gd precompiled package for window uses bgd.dll instead of gd.dll
gd-config is not included in thus precompiled package, so t can't be used
to retrieve the linker flags.

@@ -357,10 +357,10 @@
 # convert gnuplot.doc to gnuplot.rtf
 $(HELPFILE): doc2rtf.exe $(D)gnuplot.doc win/wgnuplot.hpj
 	./doc2rtf $(D)gnuplot.doc win/gnuplot.rtf
-	$(HCW) /c /e win/wgnuplot.hpj
+	$(HCW) //c //e win/wgnuplot.hpj

 doc2rtf.exe: $(D)doc2rtf.c $(D)termdoc.c $(D)xref.c
-	$(LD) $(LDFLAGS) -o $@ -DWINDOWS_NO_GUI $(CFLAGS) -I. -I$(D) -I$(T) $^
+	$(LD) $(LDFLAGS) -o $@ -DWINDOWS_NO_GUI $(CFLAGS) -I. -I$(D) -I$(T)
-I../term $^

 #make binary demo files
 $(M)bf_test.exe : bf_test.c dbinary.$(O) alloc.$(O)


Two things here :
First, MSYS will expand /c and /e as C:\ and E:\, so to avoid this we nee=
d
to use //c and //e
Then, with the original line for doc2rtf.exe, the linker reports that it
can't find *.trm files, although $(T) expands as ../term/ correctly. By
manually adding -I../term, it finds them. There should be a cleaner
solution, but I simply don't understand why it doesn't work
out-of-the-box...

Best regards,

Timoth=E9e Lecomte