[Olsr-cvs] olsrd-current/make Makefile.fbsd, 1.8, 1.9 Makefile.linux, 1.7, 1.8 Makefile.nbsd, 1.5, 1.6 Makefile.obsd, 1.4, 1.5 Makefile.osx, 1.6, 1.7 Makefile.win32, 1.6, 1.7 Makefile.wince, 1.3, 1.4

Bernd Petrovitsch (spam-protected)
Sun Nov 12 22:54:55 CET 2006


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

Modified Files:
	Makefile.fbsd Makefile.linux Makefile.nbsd Makefile.obsd 
	Makefile.osx Makefile.win32 Makefile.wince 
Log Message:
* applied olsrd-0.4.10-paths.diff

Index: Makefile.obsd
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.obsd,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.obsd	21 Oct 2006 21:24:46 -0000	1.4
--- Makefile.obsd	12 Nov 2006 21:54:53 -0000	1.5
***************
*** 3,8 ****
  #
  
! INSTALL_PREFIX ?=
! LIBDIR =	$(INSTALL_PREFIX)/usr/lib
  
  SRCS +=		$(wildcard src/bsd/*.c) $(wildcard src/unix/*.c)
--- 3,8 ----
  #
  
! DESTDIR ?=
! LIBDIR =	$(DESTDIR)/usr/lib
  
  SRCS +=		$(wildcard src/bsd/*.c) $(wildcard src/unix/*.c)

Index: Makefile.wince
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.wince,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.wince	21 Oct 2006 21:24:46 -0000	1.3
--- Makefile.wince	12 Nov 2006 21:54:53 -0000	1.4
***************
*** 3,8 ****
  #
  
! INSTALL_PREFIX ?=
! LIBDIR =	$(INSTALL_PREFIX)/usr/lib
  
  SRCS +=		$(wildcard src/win32/*.c)
--- 3,8 ----
  #
  
! DESTDIR ?=
! LIBDIR =	$(DESTDIR)/usr/lib
  
  SRCS +=		$(wildcard src/win32/*.c)

Index: Makefile.win32
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.win32,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile.win32	21 Oct 2006 21:24:46 -0000	1.6
--- Makefile.win32	12 Nov 2006 21:54:53 -0000	1.7
***************
*** 3,7 ****
  #
  
! INSTALL_PREFIX ?=
  EXENAME = olsrd.exe
  
--- 3,7 ----
  #
  
! DESTDIR ?=
  EXENAME = olsrd.exe
  

Index: Makefile.linux
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.linux,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile.linux	21 Oct 2006 21:24:46 -0000	1.7
--- Makefile.linux	12 Nov 2006 21:54:53 -0000	1.8
***************
*** 3,12 ****
  #
  
! INSTALL_PREFIX ?=
! ifeq ($(shell arch),x86_64)
! LIBDIR =	$(INSTALL_PREFIX)/usr/lib64
! else
! LIBDIR =	$(INSTALL_PREFIX)/usr/lib
! endif
  
  SRCS += 	$(wildcard src/linux/*.c) $(wildcard src/unix/*.c)
--- 3,9 ----
  #
  
! ARCH := $(shell uname -m)
! DESTDIR ?=
! LIBDIR =	$(DESTDIR)$(shell [ "$(ARCH)" = "x86_64" && -d "/usr/lib64" ] && echo "/usr/lib64" || echo "/usr/lib")
  
  SRCS += 	$(wildcard src/linux/*.c) $(wildcard src/unix/*.c)
***************
*** 23,27 ****
  GENERATE_PIC = true
  endif
! ifeq ($(shell arch),x86_64)
  GENERATE_PIC = true
  endif
--- 20,24 ----
  GENERATE_PIC = true
  endif
! ifeq ($(ARCH),x86_64)
  GENERATE_PIC = true
  endif

Index: Makefile.osx
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.osx,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile.osx	21 Oct 2006 21:24:46 -0000	1.6
--- Makefile.osx	12 Nov 2006 21:54:53 -0000	1.7
***************
*** 7,12 ****
  STRIP = \#
  
! INSTALL_PREFIX ?=
! LIBDIR =	$(INSTALL_PREFIX)/usr/lib
  
  SRCS +=		$(wildcard src/bsd/*.c) $(wildcard src/unix/*.c)
--- 7,12 ----
  STRIP = \#
  
! DESTDIR ?=
! LIBDIR =	$(DESTDIR)/usr/lib
  
  SRCS +=		$(wildcard src/bsd/*.c) $(wildcard src/unix/*.c)

Index: Makefile.fbsd
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.fbsd,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile.fbsd	21 Oct 2006 21:24:46 -0000	1.8
--- Makefile.fbsd	12 Nov 2006 21:54:53 -0000	1.9
***************
*** 3,12 ****
  #
  
! INSTALL_PREFIX ?= /usr/local
! SBINDIR = $(INSTALL_PREFIX)/sbin
! ETCDIR = $(INSTALL_PREFIX)/etc
! LIBDIR = $(INSTALL_PREFIX)/lib
! DOCDIR = $(INSTALL_PREFIX)/share/doc
! MANDIR = $(INSTALL_PREFIX)/man
  
  SRCS +=		$(wildcard src/bsd/*.c) $(wildcard src/unix/*.c)
--- 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)
***************
*** 23,28 ****
  ifdef LIBNET
  
! CFLAGS +=	-DSPOOF -I$(INSTALL_PREFIX)/include
! LIBS +=		-L$(INSTALL_PREFIX)/lib -lnet
  
  endif
--- 23,28 ----
  ifdef LIBNET
  
! CFLAGS +=	-DSPOOF -I$(DESTDIR)/include
! LIBS +=		-L$(DESTDIR)/lib -lnet
  
  endif

Index: Makefile.nbsd
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.nbsd,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.nbsd	21 Oct 2006 21:24:46 -0000	1.5
--- Makefile.nbsd	12 Nov 2006 21:54:53 -0000	1.6
***************
*** 3,8 ****
  #
  
! INSTALL_PREFIX ?=
! LIBDIR =	$(INSTALL_PREFIX)/usr/lib
  
  SRCS +=		$(wildcard src/bsd/*.c) $(wildcard src/unix/*.c)
--- 3,8 ----
  #
  
! DESTDIR ?=
! LIBDIR =	$(DESTDIR)/usr/lib
  
  SRCS +=		$(wildcard src/bsd/*.c) $(wildcard src/unix/*.c)





More information about the Olsr-cvs mailing list