From: Richard W.M. Jones <rjones@redhat.com> <"Richard W.M. Jones <rjones@redhat.com>">
Date: Fri, 14 Nov 2008 11:26:10 +0000 (+0000)
Subject: Elementary mistake.
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=375ef99d7edf7c5c6d0e86477a4ee25d04000cb6;p=fedora-mingw.git

Elementary mistake.
---

diff --git a/flexdll/flexlink.exe b/flexdll/flexlink.exe
index 41724cd..83dacfc 100755
--- a/flexdll/flexlink.exe
+++ b/flexdll/flexlink.exe
@@ -1,4 +1,4 @@
 #!/bin/sh -
 
 FLEXDIR=@libdir@/flexdll
-@libdir@/flexdll/flexlink.exe
\ No newline at end of file
+@libdir@/flexdll/flexlink.exe "$@"
\ No newline at end of file
diff --git a/flexdll/mingw32-flexdll.spec b/flexdll/mingw32-flexdll.spec
index c30ba18..c50630f 100644
--- a/flexdll/mingw32-flexdll.spec
+++ b/flexdll/mingw32-flexdll.spec
@@ -11,7 +11,7 @@
 
 Name:           mingw32-flexdll
 Version:        0.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        FlexDLL Windows DLL plugin API which is like dlopen
 
 License:        zlib
@@ -124,5 +124,5 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Nov 14 2008 Richard W.M. Jones <rjones@redhat.com> - 0.11-1
+* Fri Nov 14 2008 Richard W.M. Jones <rjones@redhat.com> - 0.11-2
 - Initial RPM release.
diff --git a/ocaml/mingw32-ocaml.spec b/ocaml/mingw32-ocaml.spec
index 4dfc76b..08c18bb 100644
--- a/ocaml/mingw32-ocaml.spec
+++ b/ocaml/mingw32-ocaml.spec
@@ -47,9 +47,18 @@ CFLAGS="$RPM_OPT_FLAGS" \
   -libdir %{_libdir}/ocaml \
   -x11lib %{_libdir} \
   -x11include %{_includedir} \
-  -mandir %{_mandir}/man1
+  -mandir %{_mandir}/man1 \
+  -cc %{_mingw32_cc} \
+  -as %{_mingw32_as}
 
+# ./configure creates the following files:
+#     config/Makefile - containing mainly paths and names of build tools
+#     config/m.h - containing the machine description
+#     config/s.h - containing the environment / API description
+
+# Overwrite the generated m.h & s.h with the ones from Windows NT.
 cp config/m-nt.h config/m.h
+cp config/s-nt.h config/s.h
 
 make world bootstrap opt opt.opt
 
@@ -74,5 +83,5 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Oct 24 2008 Richard W.M. Jones <rjones@redhat.com> - 3.11.0+beta1-1
+* Fri Nov 14 2008 Richard W.M. Jones <rjones@redhat.com> - 3.11.0+beta1-1
 - Initial RPM release.