[Olsr-cvs] olsrd-current Makefile.inc, 1.24, 1.25 Makefile, 1.91, 1.92

[Bernd Petrovitsch]

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

Modified Files:
	Makefile.inc Makefile 
Log Message:
* added olsr_makefile_make_use_of_exename.patch from Arnd Hannemann <(spam-protected)>

Index: Makefile
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/Makefile,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -d -r1.91 -r1.92
*** Makefile	2 Aug 2007 20:54:01 -0000	1.91
--- Makefile	19 Aug 2007 20:47:09 -0000	1.92
***************
*** 61,67 ****
  TAG_SRCS = $(SRCS) $(HDRS) $(wildcard src/cfgparser/*.c) $(wildcard src/cfgparser/*.h) $(wildcard src/olsr_switch/*.c) $(wildcard src/olsr_switch/*.h)
  
! default_target: cfgparser olsrd
  
! olsrd:		$(OBJS) $(CFGOBJS)
  		$(CC) $(LDFLAGS) -o $@ $(OBJS) $(CFGOBJS) $(LIBS)
  
--- 61,67 ----
  TAG_SRCS = $(SRCS) $(HDRS) $(wildcard src/cfgparser/*.c) $(wildcard src/cfgparser/*.h) $(wildcard src/olsr_switch/*.c) $(wildcard src/olsr_switch/*.h)
  
! default_target: cfgparser $(EXENAME)
  
! $(EXENAME):		$(OBJS) $(CFGOBJS)
  		$(CC) $(LDFLAGS) -o $@ $(OBJS) $(CFGOBJS) $(LIBS)
  
***************
*** 78,82 ****
  
  clean:
! 		-rm -f $(OBJS) $(SRCS:%.c=%.d) olsrd olsrd.exe
  		$(MAKECMD) -C $(CFGDIR) clean
  
--- 78,82 ----
  
  clean:
! 		-rm -f $(OBJS) $(SRCS:%.c=%.d) $(EXENAME) $(EXENAME).exe
  		$(MAKECMD) -C $(CFGDIR) clean
  
***************
*** 96,100 ****
  install_olsrd:	install_bin
  		@echo ========= C O N F I G U R A T I O N - F I L E ============
! 		@echo olsrd uses the configfile $(CFGFILE)
  		@echo a default configfile. A sample RFC-compliance aimed
  		@echo configfile can be installed. Note that a LQ-based configfile
--- 96,100 ----
  install_olsrd:	install_bin
  		@echo ========= C O N F I G U R A T I O N - F I L E ============
! 		@echo $(EXENAME) uses the configfile $(CFGFILE)
  		@echo a default configfile. A sample RFC-compliance aimed
  		@echo configfile can be installed. Note that a LQ-based configfile
***************
*** 106,114 ****
  		@echo Edit $(CFGFILE) before running olsrd!!
  		@echo -------------------------------------------
! 		@echo Installing manpages olsrd\(8\) and olsrd.conf\(5\)
  		mkdir -p $(MANDIR)/man8/
! 		cp files/olsrd.8.gz $(MANDIR)/man8/olsrd.8.gz
  		mkdir -p $(MANDIR)/man5/
! 		cp files/olsrd.conf.5.gz $(MANDIR)/man5/olsrd.conf.5.gz
  
  tags:
--- 106,114 ----
  		@echo Edit $(CFGFILE) before running olsrd!!
  		@echo -------------------------------------------
! 		@echo Installing manpages $(EXENAME)\(8\) and $(CFGNAME)\(5\)
  		mkdir -p $(MANDIR)/man8/
! 		cp files/olsrd.8.gz $(MANDIR)/man8/$(EXENAME).8.gz
  		mkdir -p $(MANDIR)/man5/
! 		cp files/olsrd.conf.5.gz $(MANDIR)/man5/$(CFGNAME).5.gz
  
  tags:
***************
*** 182,186 ****
  
  
! build_all:	cfgparser olsrd libs switch
  install_all:	install install_libs
  clean_all:	uberclean clean_libs
--- 182,186 ----
  
  
! build_all:	cfgparser libs $(EXENAME) switch
  install_all:	install install_libs
  clean_all:	uberclean clean_libs

Index: Makefile.inc
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/Makefile.inc,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Makefile.inc	16 Aug 2007 18:41:34 -0000	1.24
--- Makefile.inc	19 Aug 2007 20:47:09 -0000	1.25
***************
*** 18,23 ****
  DOCDIR  ?= $(DESTDIR)/usr/share/doc
  MANDIR  ?= $(DESTDIR)/usr/share/man
- CFGFILE ?= $(ETCDIR)/olsrd.conf
  EXENAME ?= olsrd
  
  CPPFLAGS =	-Isrc -I$(TOPDIR)/src 
--- 18,24 ----
  DOCDIR  ?= $(DESTDIR)/usr/share/doc
  MANDIR  ?= $(DESTDIR)/usr/share/man
  EXENAME ?= olsrd
+ CFGNAME ?= $(EXENAME).conf
+ CFGFILE ?= $(ETCDIR)/$(CFGNAME)
  
  CPPFLAGS =	-Isrc -I$(TOPDIR)/src