80701d3484
- Update to 0.9.8 - Switch to fetch from GitHub because they don't provide tarballs anymore - Fix portlint warnings - Fix some GNUisms (cp -t) - Fix compile error when RTF_CLONING is not defined PR: 240563 Submitted by: myself Approved by: Nikola Kolev <koue@chaosophia.net> (maintainer) MFH: 2019Q4
45 lines
2 KiB
Text
45 lines
2 KiB
Text
--- Makefile.orig 2019-08-11 08:09:47 UTC
|
|
+++ Makefile
|
|
@@ -167,20 +167,17 @@ uninstall_bin:
|
|
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 found in olsrd.conf.default.rfc.
|
|
- @echo However none of the larger OLSRD using networks use that
|
|
- @echo so install a configfile with activated link quality exstensions
|
|
- @echo per default.
|
|
- @echo can be found at files/olsrd.conf.default.lq
|
|
+ @echo a default configfile. Sample config files are installed
|
|
+ @echo as $(CFGFILE).default.full, $(CFGFILE).default.rfc,
|
|
+ @echo $(CFGFILE).default.lq and $(CFGFILE).default.lq-fisheye
|
|
+ @echo copy and edit one of these to $(CFGFILE)
|
|
+ @echo If in doubt start with $(CFGFILE).default.lq
|
|
@echo ==========================================================
|
|
mkdir -p $(ETCDIR)
|
|
- $(MAKECMDPREFIX)if [ -e $(CFGFILE) ]; then \
|
|
- cp -f files/olsrd.conf.default.lq $(CFGFILE).new; \
|
|
- echo "Configuration file was saved as $(CFGFILE).new"; \
|
|
- else \
|
|
- cp -f files/olsrd.conf.default.lq $(CFGFILE); \
|
|
- fi
|
|
+ -cp files/olsrd.conf.default.full $(CFGFILE).default.full
|
|
+ -cp files/olsrd.conf.default.rfc $(CFGFILE).default.rfc
|
|
+ -cp files/olsrd.conf.default.lq $(CFGFILE).default.lq
|
|
+ -cp files/olsrd.conf.default.lq-fisheye $(CFGFILE).default.lq-fisheye
|
|
@echo -------------------------------------------
|
|
@echo Edit $(CFGFILE) before running olsrd!!
|
|
@echo -------------------------------------------
|
|
@@ -196,9 +193,10 @@ ifneq ($(RCDIR),)
|
|
endif
|
|
ifneq ($(DOCDIR_OLSRD),)
|
|
mkdir -p "$(DOCDIR_OLSRD)"
|
|
- cp -t "$(DOCDIR_OLSRD)" "CHANGELOG" "README-Olsr-Extensions" \
|
|
+ cp "CHANGELOG" "README-Olsr-Extensions" \
|
|
"README-LINUX_NL80211.txt" "files/olsrd.conf.default" \
|
|
- "files/olsrd.conf.default.txt" "license.txt"
|
|
+ "files/olsrd.conf.default.txt" "license.txt" \
|
|
+ "$(DOCDIR_OLSRD)"
|
|
endif
|
|
|
|
uninstall_olsrd: uninstall_bin
|