On Wed, 2008-04-02 at 23:46 +0200, Pierre Pronchery wrote:
[...]
> plain text document attachment (olsrd-0.5.5_netbsd.patch)
> diff -Naur olsrd-a5b9cf969979/Makefile.inc olsrd-a5b9cf969979.netbsd/Makefile.inc
> --- olsrd-a5b9cf969979/Makefile.inc	2008-02-06 19:32:49.000000000 +0100
> +++ olsrd-a5b9cf969979.netbsd/Makefile.inc	2008-02-08 19:50:38.000000000 +0100
> @@ -40,12 +40,13 @@
>  TAGCMD ?=	etags
>  
>  # target directories and names
> +PREFIX	?= /usr/local

That is in the big picture actually also in the Linux world the right
thing to do as most (if not all) tools - with and without autoconf -
default to an installation under "/usr/local".
Alas, packagers will need to update there packaging
script/spec-files/...

>  DESTDIR ?=
> -SBINDIR ?= $(DESTDIR)/usr/sbin
> -ETCDIR  ?= $(DESTDIR)/etc
> -LIBDIR  ?= $(DESTDIR)/usr/lib
> -DOCDIR  ?= $(DESTDIR)/usr/share/doc
> -MANDIR  ?= $(DESTDIR)/usr/share/man
> +SBINDIR ?= $(DESTDIR)/$(PREFIX)/sbin
> +ETCDIR  ?= $(DESTDIR)/$(PREFIX)/etc
> +LIBDIR  ?= $(DESTDIR)/$(PREFIX)/lib
> +DOCDIR  ?= $(DESTDIR)/$(PREFIX)/share/doc
> +MANDIR  ?= $(DESTDIR)/$(PREFIX)/share/man
>  EXENAME ?= olsrd
>  CFGNAME ?= $(EXENAME).conf
>  CFGFILE ?= $(ETCDIR)/$(CFGNAME)
> diff -Naur olsrd-a5b9cf969979/make/Makefile.nbsd olsrd-a5b9cf969979.netbsd/make/Makefile.nbsd
> --- olsrd-a5b9cf969979/make/Makefile.nbsd	2008-02-06 19:32:49.000000000 +0100
> +++ olsrd-a5b9cf969979.netbsd/make/Makefile.nbsd	2008-02-10 02:51:20.000000000 +0100
> @@ -8,8 +8,8 @@
>  SRCS +=		$(wildcard src/bsd/*.c src/unix/*.c)
>  HDRS +=		$(wildcard src/bsd/*.h src/unix/*.h)
>  
> -CPPFLAGS +=	-D__NetBSD__

Does that come from elsewhere (as we check for it in the source)?

	Bernd
-- 
Firmix Software GmbH                   http://www.firmix.at/
mobil: +43 664 4416156                 fax: +43 1 7890849-55
          Embedded Linux Development and Services



