diff options
| author | Emanuel Haupt <ehaupt@FreeBSD.org> | 2006-03-17 15:08:02 +0000 |
|---|---|---|
| committer | Emanuel Haupt <ehaupt@FreeBSD.org> | 2006-03-17 15:08:02 +0000 |
| commit | a29985d551dc72368f098a832e98f02ddcaece7c (patch) | |
| tree | 256d78c37f052898ae215983cf740358c5c1c8ce /net/olsrd/files/patch-Makefile | |
| parent | Note that textproc/docproj[-jadetex] now installs CJK related stuff by (diff) | |
Update to 0.4.10
PR: 94425
Submitted by: Dave Cornejo <dave@dogwood.com> (maintainer)
Diffstat (limited to 'net/olsrd/files/patch-Makefile')
| -rw-r--r-- | net/olsrd/files/patch-Makefile | 75 |
1 files changed, 16 insertions, 59 deletions
diff --git a/net/olsrd/files/patch-Makefile b/net/olsrd/files/patch-Makefile index be266a57d769..2cc0b83fb98d 100644 --- a/net/olsrd/files/patch-Makefile +++ b/net/olsrd/files/patch-Makefile @@ -1,65 +1,22 @@ ---- Makefile.orig Thu Mar 31 20:39:24 2005 -+++ Makefile Sat Apr 9 00:09:42 2005 -@@ -47,7 +47,9 @@ - CCWARNINGS = -Wall -Wmissing-prototypes -Wstrict-prototypes \ - -Wmissing-declarations -Wsign-compare - --INSTALL_PREFIX ?= -+PREFIX?= /usr/local -+INSTALL_PREFIX?= ${PREFIX} -+CFGFILE?= ${INSTALL_PREFIX}/etc/olsrd.conf - - INCLUDES = -Isrc - -@@ -84,7 +86,7 @@ - - SRCS += $(wildcard src/bsd/*.c) $(wildcard src/unix/*.c) - HDRS += $(wildcard src/bsd/*.h) $(wildcard src/unix/*.h) --CFLAGS ?= $(CCWARNINGS) -O2 -g -+CFLAGS += -DOLSRD_GLOBAL_CONF_FILE=\"${CFGFILE}\" - LIBS = -lm - MAKEDEPEND = makedepend -f $(DEPFILE) -D__FreeBSD__ $(INCLUDES) $(SRCS) - -@@ -96,8 +98,8 @@ - - SRCS += $(wildcard src/bsd/*.c) $(wildcard src/unix/*.c) - HDRS += $(wildcard src/bsd/*.h) $(wildcard src/unix/*.h) --CFLAGS ?= -Wall -Wmissing-prototypes -O2 -g -DSPOOF -I/usr/local/include --LIBS = -lm -L/usr/local/lib -lnet -+CFLAGS += -DSPOOF -I${LOCALBASE}/include -DOLSRD_GLOBAL_CONF_FILE=\"${CFGFILE}\" -+LIBS = -lm -L${LOCALBASE}/lib -lnet - MAKEDEPEND = makedepend -f $(DEPFILE) -D__FreeBSD__ $(INCLUDES) $(SRCS) - - all: cfgparser olsrd -@@ -292,8 +294,8 @@ - - install_bin: - $(STRIP) olsrd -- mkdir -p $(INSTALL_PREFIX)/usr/sbin -- install -m 755 olsrd $(INSTALL_PREFIX)/usr/sbin -+ mkdir -p $(INSTALL_PREFIX)/sbin -+ install -m 755 olsrd $(INSTALL_PREFIX)/sbin +--- Makefile.orig Tue Jan 3 22:45:38 2006 ++++ Makefile Tue Mar 7 19:25:12 2006 +@@ -90,13 +90,13 @@ install_olsrd: install_bin @echo ========= C O N F I G U R A T I O N - F I L E ============ -@@ -303,15 +305,15 @@ - @echo can be found at files/olsrd.conf.default.lq +- @echo olsrd uses the configfile $(INSTALL_PREFIX)/etc/olsr.conf +- @echo a default configfile. A sample RFC-compliance aimed +- @echo configfile can be installed. Note that a LQ-based configfile +- @echo can be found at files/olsrd.conf.default.lq ++ @echo olsrd uses the configfile $(CFGFILE) ++ @echo an RFC compliant version is installed as $(CFGFILE).rfc ++ @echo an LQ version is installed as $(CFGFILE).lq ++ @echo copy and edit one of these to $(CFGFILE) @echo ========================================================== - mkdir -p $(INSTALL_PREFIX)/etc -- cp -i files/olsrd.conf.default.rfc $(INSTALL_PREFIX)/etc/olsrd.conf -+ cp files/olsrd.conf.default.rfc $(INSTALL_PREFIX)/etc/olsrd.conf.default +- mkdir -p $(ETCDIR) +- -cp -i files/olsrd.conf.default.rfc $(CFGFILE) ++ -cp files/olsrd.conf.default.rfc $(CFGFILE).rfc ++ -cp files/olsrd.conf.default.lq $(CFGFILE).lq @echo ------------------------------------------- - @echo Edit $(INSTALL_PREFIX)/etc/olsrd.conf before running olsrd!! + @echo Edit $(CFGFILE) before running olsrd!! @echo ------------------------------------------- - @echo Installing manpages olsrd\(8\) and olsrd.conf\(5\) -- mkdir -p $(INSTALL_PREFIX)/usr/share/man/man8/ -- cp files/olsrd.8.gz $(INSTALL_PREFIX)/usr/share/man/man8/olsrd.8.gz -- mkdir -p $(INSTALL_PREFIX)/usr/share/man/man5/ -- cp files/olsrd.conf.5.gz $(INSTALL_PREFIX)/usr/share/man/man5/olsrd.conf.5.gz -+ mkdir -p $(INSTALL_PREFIX)/man/man8/ -+ cp files/olsrd.8.gz $(INSTALL_PREFIX)/man/man8/olsrd.8.gz -+ mkdir -p $(INSTALL_PREFIX)/man/man5/ -+ cp files/olsrd.conf.5.gz $(INSTALL_PREFIX)/man/man5/olsrd.conf.5.gz - - # - # PLUGINS |