[Olsr-cvs] olsrd-current Makefile.inc,1.15,1.16

[Thomas Lopatic]

Update of /cvsroot/olsrd/olsrd-current
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4885

Modified Files:
	Makefile.inc 
Log Message:
(1) On Windows $(OS) is not undefined but contains "Windows_NT". Now handled in Makefile.inc instead of guess_os.sh. (2) Fixed re-definition of write() in Windows version of unistd.h.

Index: Makefile.inc
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/Makefile.inc,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Makefile.inc	1 May 2007 21:52:52 -0000	1.15
--- Makefile.inc	13 May 2007 23:44:23 -0000	1.16
***************
*** 71,74 ****
--- 71,77 ----
  
  # OS detection
+ ifeq ($(OS),Windows_NT)
+ OS = win32
+ endif
  ifeq ($(OS),)
  OS :=		$(shell sh $(TOPDIR)/make/guess_os.sh)