[Olsr-cvs] olsrd-current/make Makefile.fbsd,1.11,1.12

[Bernd Petrovitsch]

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

Modified Files:
	Makefile.fbsd 
Log Message:
* bug fixes and cleanups by John Hay <(spam-protected)> for FreeBSD

Index: Makefile.fbsd
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.fbsd,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Makefile.fbsd	29 Aug 2007 21:46:25 -0000	1.11
--- Makefile.fbsd	4 Oct 2007 22:27:31 -0000	1.12
***************
*** 3,12 ****
  #
  
! DESTDIR ?= /usr/local
! SBINDIR = $(DESTDIR)/sbin
! ETCDIR = $(DESTDIR)/etc
! LIBDIR = $(DESTDIR)/lib
! DOCDIR = $(DESTDIR)/share/doc
! MANDIR = $(DESTDIR)/man
  
  SRCS +=		$(wildcard src/bsd/*.c) $(wildcard src/unix/*.c)
--- 3,12 ----
  #
  
! PREFIX ?= /usr/local
! SBINDIR = $(PREFIX)/sbin
! ETCDIR = $(PREFIX)/etc
! LIBDIR = $(PREFIX)/lib
! DOCDIR = $(PREFIX)/share/doc
! MANDIR = $(PREFIX)/man
  
  SRCS +=		$(wildcard src/bsd/*.c) $(wildcard src/unix/*.c)
***************
*** 23,28 ****
  ifdef LIBNET
  
! CPPFLAGS +=	-DSPOOF -I$(DESTDIR)/include
! LIBS +=		-L$(DESTDIR)/lib -lnet
  
  endif
--- 23,28 ----
  ifdef LIBNET
  
! CPPFLAGS +=	-DSPOOF -I$(PREFIX)/include
! LIBS +=		-L$(PREFIX)/lib -lnet
  
  endif