(windows) build fixes

2 files changed, 70 insertions, 4 deletions

diff --git a/hyphen/hyphen-2.3.patch b/hyphen/hyphen-2.3.patch
index 28d3fc596843..c679c337ea8d 100644
--- a/hyphen/hyphen-2.3.patch
+++ b/hyphen/hyphen-2.3.patch
@@ -37,3 +37,67 @@ diff -u -u -r1.8 -r1.8.32.1
            } else {
              dict->states[state_num].replcut = replcut;
            }
+*** misc/build/hyphen-2.3/makefile.mk	2008-02-18 10:30:28.000000000 +0100
+--- misc/build/hyphen-2.3/makefile.mk	2008-02-18 10:27:19.000000000 +0100
+***************
+*** 1 ****
+! dummy
+--- 1,58 ----
+! #*************************************************************************
+! #
+! #   $RCSfile: hyphen-2.3.patch,v $
+! #
+! #   $Revision: 1.2 $
+! #
+! #   last change: $Author: rene $ $Date: 2008-02-18 09:42:59 $
+! #
+! #*  The Contents of this file are made available subject to
+! #*  the terms of GNU Lesser General Public License Version 2.1.
+! #*
+! #*
+! #*    GNU Lesser General Public License Version 2.1
+! #*    =============================================
+! #*    Copyright 2005 by Sun Microsystems, Inc.
+! #*    901 San Antonio Road, Palo Alto, CA 94303, USA
+! #*
+! #*    This library is free software; you can redistribute it and/or
+! #*    modify it under the terms of the GNU Lesser General Public
+! #*    License version 2.1, as published by the Free Software Foundation.
+! #*
+! #*    This library is distributed in the hope that it will be useful,
+! #*    but WITHOUT ANY WARRANTY; without even the implied warranty of
+! #*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+! #*    Lesser General Public License for more details.
+! #*
+! #*    You should have received a copy of the GNU Lesser General Public
+! #*    License along with this library; if not, write to the Free Software
+! #*    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+! #*    MA  02111-1307  USA
+! #*
+! #*************************************************************************
+! 
+! PRJ = ..$/..$/..$/..
+! 
+! PRJNAME = hyphen
+! TARGET  = hyphen
+! CFLAGSCALL=gsd
+! 
+! USE_DEFFILE=TRUE
+! EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
+! 
+! .INCLUDE : settings.mk
+! 
+! # --- Files --------------------------------------------------------
+! 
+! # !! not to be compiled because those belong to a stand alone programs: !!
+! #        $(SLO)$/createfp.obj\
+! #        $(SLO)$/testtextcat.obj
+! 
+! OBJFILES=   \
+!         $(OBJ)$/hyphen.obj\
+!         $(OBJ)$/hnjalloc.obj\
+!         $(OBJ)$/csutil.obj
+! 
+! # --- Targets ------------------------------------------------------
+! 
+! .INCLUDE : target.mk
diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index 3e7f45159507..859ddadf9883 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: rene $ $Date: 2008-01-04 20:32:41 $
+#   last change: $Author: rene $ $Date: 2008-02-18 09:42:59 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -46,10 +46,12 @@ TARGET=hyphen
 
 TARFILE_NAME=hyphen-2.3
 
+ADDITIONAL_FILES += makefile.mk
+
 PATCH_FILE_NAME=hyphen-2.3.patch
 
 .IF "$(GUI)"=="UNX"
-#CONFIGURE_DIR=$(BUILD_DIR)
+CONFIGURE_DIR=$(BUILD_DIR)
 
 #relative to CONFIGURE_DIR
 CONFIGURE_ACTION=configure
@@ -61,7 +63,7 @@ BUILD_ACTION=make
 
 
 .IF "$(GUI)"=="WNT"
-BUILD_ACTION=cd src/hunspell && dmake
+BUILD_ACTION=dmake
 .ENDIF # "$(GUI)"=="WNT"