[Olsr-cvs] olsrd-current Makefile.inc,1.5,1.6

[Bernd Petrovitsch]

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

Modified Files:
	Makefile.inc 
Log Message:
* added support and automagic detection for ccache
* cosmetic cleanup


Index: Makefile.inc
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/Makefile.inc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.inc	12 Nov 2006 21:54:52 -0000	1.5
--- Makefile.inc	5 Feb 2007 21:25:49 -0000	1.6
***************
*** 1,4 ****
  # programs
! CC ?= 		gcc
  STRIP ?=	strip
  BISON ?=	bison
--- 1,5 ----
  # programs
! CCACHE =        $(shell sh -c "type -path ccache")
! CC ?= 		$(CCACHE) gcc
  STRIP ?=	strip
  BISON ?=	bison
***************
*** 7,18 ****
  
  # target directories and names
! # DESTDIR =
! SBINDIR = $(DESTDIR)/usr/sbin
! ETCDIR = $(DESTDIR)/etc
! LIBDIR = $(DESTDIR)/usr/lib
! DOCDIR = $(DESTDIR)/usr/share/doc
! MANDIR = $(DESTDIR)/usr/share/man
! CFGFILE = $(ETCDIR)/olsrd.conf
! EXENAME = olsrd
  
  INCLUDES =	-Isrc -I$(TOPDIR)/src 
--- 8,19 ----
  
  # target directories and names
! DESTDIR ?=
! SBINDIR ?= $(DESTDIR)/usr/sbin
! ETCDIR  ?= $(DESTDIR)/etc
! LIBDIR  ?= $(DESTDIR)/usr/lib
! DOCDIR  ?= $(DESTDIR)/usr/share/doc
! MANDIR  ?= $(DESTDIR)/usr/share/man
! CFGFILE ?= $(ETCDIR)/olsrd.conf
! EXENAME ?= olsrd
  
  INCLUDES =	-Isrc -I$(TOPDIR)/src