[Olsr-cvs] olsrd-current CHANGELOG, 1.103, 1.104 Makefile.inc, 1.37, 1.38

[Bernd Petrovitsch]

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

Modified Files:
	CHANGELOG Makefile.inc 
Log Message:
With the help of Patrick McCarty <(spam-protected)>, we got olsr to build
on OpenBSD again:
* OpenBSD'd `sed` is pretty conservative and doesn't understand 's|re|sub|'.
  So we fall back to the old 's/re/sub/' and quote all '/' and '.' correctly
  (which was the main reason to use '|').
* OpenBSD needs an explicit "#include <sys/types.h>" before
  "#include <netinet/in.h>".


Index: Makefile.inc
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/Makefile.inc,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** Makefile.inc	20 Oct 2007 20:23:12 -0000	1.37
--- Makefile.inc	2 Nov 2007 10:16:39 -0000	1.38
***************
*** 157,163 ****
  endif
  
  # fully automatic and working dependency generation
  %.d: %.c
! 	@$(CC) -M $(CPPFLAGS) "$<" | sed -e '1s|\($(*F)\)\.o[ :]*|$(*D)/\1.o $@: Makefile $(TOPDIR)$(if $(TOPDIR),/)Makefile.inc |g' >"$@"
  
  # we always need the includes and defines
--- 157,165 ----
  endif
  
+ quote = $(subst .,\.,$(subst /,\/,$1))
+ 
  # fully automatic and working dependency generation
  %.d: %.c
! 	$(filter-out $(CCACHE),$(CC)) -M $(strip $(CPPFLAGS)) "$<" | sed -e '1s/\($(call quote,$(*F))\.o\)[ :]*/$(call quote,$(*D)/\1 $@: Makefile $(TOPDIR)$(if $(TOPDIR),/)Makefile.inc) /g' >"$@"
  
  # we always need the includes and defines

Index: CHANGELOG
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/CHANGELOG,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -d -r1.103 -r1.104
*** CHANGELOG	2 Nov 2007 10:11:43 -0000	1.103
--- CHANGELOG	2 Nov 2007 10:16:39 -0000	1.104
***************
*** 12,15 ****
--- 12,22 ----
    larger networks uses the LQ extensions. And new customers should better
    be pushed in that direction.
+ - with the help of Patrick McCarty <(spam-protected)>, we got olsr to build
+   on OpenBSD again:
+   * OpenBSD'd `sed` is pretty conservative and doesn't understand 's|re|sub|'.
+     So we fall back to the old 's/re/sub/' and quote all '/' and '.' correctly
+     (which was the main reason to use '|').
+   * OpenBSD needs an explicit "#include <sys/types.h>" before
+     "#include <netinet/in.h>".
  
  0.5.4 ---------------------------------------------------------------------