===================================================================
RCS file: /home/cvs/OpenXM/src/kxx/Makefile.in,v
retrieving revision 1.37
retrieving revision 1.43
diff -u -p -r1.37 -r1.43
--- OpenXM/src/kxx/Makefile.in	2006/10/05 20:44:58	1.37
+++ OpenXM/src/kxx/Makefile.in	2016/03/30 08:25:44	1.43
@@ -1,4 +1,4 @@
-##  $OpenXM: OpenXM/src/kxx/Makefile.in,v 1.36 2006/02/04 02:44:39 takayama Exp $
+##  $OpenXM: OpenXM/src/kxx/Makefile.in,v 1.42 2015/09/27 05:06:29 takayama Exp $
 #  Depends on  all-kan96xx [source tree of kan96xx at ${Kan96xx} is required]
 #              install-gmp, install-gc, install-util
 #
@@ -32,8 +32,9 @@ OpenXM_include_for_debug=${OpenXM_HOME_for_debug}/incl
 CC=@CC@
 RANLIB=@RANLIB@
 LIBS=@LIBS@ 
-CFLAGS = @CFLAGS@ -g -D_BSD_SOURCE
-CFLAG2 = @CFLAG2@
+CFLAGS = @CFLAGS@ -g -D_BSD_SOURCE -I${OpenXM_include}
+# University binary is no longer supported. See old configure.in (version 1.7)
+# Or use "lipo -create ox-i386 ox-ppc -output ox"
 #STATIC_LINK_FLAG=-static
 STATIC_LINK_FLAG=
 RM=rm
@@ -58,8 +59,6 @@ configure-old : Makefile.in configure.in
 #	autoconf
 #	.error  "Run ./make-configure"
 
-.c.o:
-	${CC}  ${CFLAGS} ${CFLAG2} -I${OpenXM_include} -c  $<
 ox.a: ${Kan96xx}/plugin/ox.a
 	/bin/rm -f ox.a
 	ln -s ${Kan96xx}/plugin/ox.a ox.a
@@ -67,8 +66,8 @@ ox_kan.h: ${Kan96xx}/plugin/ox_kan.h
 	/bin/rm -f ox_kan.h
 	ln -s ${Kan96xx}/plugin/ox_kan.h ox_kan.h
 
-ox: oxmain.o ${Kan96xx}/plugin/mytcpio.o ${Kan96xx}/plugin/oxmisc.o file2.o
-	${CC} ${STATIC_LINK_FLAG} ${CFLAGS} ${CFLAG2} oxmain.o ${Kan96xx}/plugin/mytcpio.o ${Kan96xx}/plugin/oxmisc.o file2.o -o ox  ${LIBS}
+ox: oxmain.o ${Kan96xx}/plugin/mytcpio.o ${Kan96xx}/plugin/oxmisc.o ${Kan96xx}/plugin/mysig.o file2.o
+	${CC} ${STATIC_LINK_FLAG} ${CFLAGS} oxmain.o ${Kan96xx}/plugin/mytcpio.o ${Kan96xx}/plugin/oxmisc.o ${Kan96xx}/plugin/mysig.o file2.o -o ox  ${LIBS}
 oxmain.o: oxmain.c ox_kan.h serversm.h
 
 oxd: oxd.o xtag.o ${Kan96xx}/plugin/mytcpio.o ${Kan96xx}/plugin/oxmisc.o file2.o 
@@ -95,7 +94,7 @@ ox100start : ox100start.o  ${OpenXM_lib}/libox_pathfin
 ox100start.o: ox100start.c
 
 file2.o: ${Kan96xx}/plugin/file2.c  ${Kan96xx}/plugin/file2.h
-	${CC} $(CFLAGS) ${CFLAG2} -DKXX=1 -I${Kan96xx}/plugin -c ${Kan96xx}/plugin/file2.c 
+	${CC} $(CFLAGS) -DKXX=1 -I${Kan96xx}/plugin -c ${Kan96xx}/plugin/file2.c 
 
 nullstackmachine.o: nullstackmachine.c ox_kan.h
 sm1stackmachine.o: sm1stackmachine.c  ox_kan.h
@@ -148,6 +147,8 @@ install-exec: copy-kan-lib install_lib_bin
 	install ox ox_sm1 oxlog ox100start ox_texmacs ${OpenXM_bin}
 install_lib_bin:
 	if [  "`uname | sed -e 's/_.*$$//'`" = "CYGWIN" ]; then \
+	  make install_lib_bin_windows ; \
+	elif [  "`uname | sed -e 's/_.*$$//'`" = "MSYS" ];  then \
 	  make install_lib_bin_windows ; \
 	else \
 	  make install_lib_bin_unix ; \