146 lines
6.0 KiB
Plaintext
146 lines
6.0 KiB
Plaintext
$NetBSD: patch-Makefile,v 1.3 2016/05/06 07:41:06 jnemeth Exp $
|
|
|
|
--- Makefile.orig 2016-04-20 10:46:18.000000000 +0000
|
|
+++ Makefile
|
|
@@ -135,7 +135,7 @@ DEBUG=-g3
|
|
|
|
# Asterisk.conf is located in ASTETCDIR or by using the -C flag
|
|
# when starting Asterisk
|
|
-ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
|
|
+ASTCONFPATH=$(ASTEXAMPLEDIR)/asterisk.conf
|
|
AGI_DIR=$(ASTDATADIR)/agi-bin
|
|
|
|
# If you use Apache, you may determine by a grep 'DocumentRoot' of your httpd.conf file
|
|
@@ -172,6 +172,9 @@ DAHDI_UDEV_HOOK_DIR = /usr/share/dahdi/s
|
|
# supported run:
|
|
# menuselect/menuselect --help
|
|
|
|
+GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts)
|
|
+USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts)
|
|
+
|
|
|
|
MOD_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include"
|
|
OTHER_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include"
|
|
@@ -211,10 +214,6 @@ ifeq ($(AST_DEVMODE),yes)
|
|
ADDL_TARGETS+=validate-docs
|
|
endif
|
|
|
|
-ifneq ($(findstring BSD,$(OSARCH)),)
|
|
- _ASTCFLAGS+=-isystem /usr/local/include
|
|
-endif
|
|
-
|
|
ifeq ($(OSARCH),FreeBSD)
|
|
# -V is understood by BSD Make, not by GNU make.
|
|
BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
|
|
@@ -342,10 +341,10 @@ makeopts: configure
|
|
@echo "****"
|
|
@exit 1
|
|
|
|
-menuselect.makeopts: menuselect/menuselect menuselect-tree makeopts build_tools/menuselect-deps
|
|
+menuselect.makeopts: menuselect/menuselect menuselect-tree makeopts build_tools/menuselect-deps $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
|
|
ifeq ($(filter %menuselect,$(MAKECMDGOALS)),)
|
|
menuselect/menuselect --check-deps $@
|
|
- menuselect/menuselect --check-deps $@
|
|
+ menuselect/menuselect --check-deps $@ $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
|
|
endif
|
|
|
|
$(MOD_SUBDIRS_EMBED_LDSCRIPT):
|
|
@@ -445,7 +444,6 @@ dist-clean: distclean
|
|
|
|
distclean: $(SUBDIRS_DIST_CLEAN) _clean
|
|
@$(MAKE) -C menuselect dist-clean
|
|
- @$(MAKE) -C sounds dist-clean
|
|
rm -f menuselect.makeopts makeopts menuselect-tree menuselect.makedeps
|
|
rm -f makeopts.embed_rules
|
|
rm -f config.log config.status config.cache
|
|
@@ -561,7 +559,7 @@ update:
|
|
|
|
NEWHEADERS=$(notdir $(wildcard include/asterisk/*.h))
|
|
OLDHEADERS=$(filter-out $(NEWHEADERS) $(notdir $(DESTDIR)$(ASTHEADERDIR)),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
|
|
-INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDIR)" "$(ASTETCDIR)" "$(ASTVARRUNDIR)" \
|
|
+INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDIR)" "$(ASTEXAMPLEDIR)" "$(ASTVARRUNDIR)" \
|
|
"$(ASTSPOOLDIR)" "$(ASTSPOOLDIR)/dictate" "$(ASTSPOOLDIR)/meetme" \
|
|
"$(ASTSPOOLDIR)/monitor" "$(ASTSPOOLDIR)/system" "$(ASTSPOOLDIR)/tmp" \
|
|
"$(ASTSPOOLDIR)/voicemail" "$(ASTSPOOLDIR)/recording" \
|
|
@@ -688,7 +686,7 @@ upgrade: bininstall
|
|
# (2) the extension to strip off
|
|
define INSTALL_CONFIGS
|
|
@for x in configs/$(1)/*$(2); do \
|
|
- dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x $(2)`"; \
|
|
+ dst="$(DESTDIR)$(ASTEXAMPLEDIR)/`$(BASENAME) $$x $(2)`"; \
|
|
if [ -f "$${dst}" ]; then \
|
|
if [ "$(OVERWRITE)" = "y" ]; then \
|
|
if cmp -s "$${dst}" "$$x" ; then \
|
|
@@ -717,24 +715,24 @@ define INSTALL_CONFIGS
|
|
-e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \
|
|
-e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \
|
|
-e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \
|
|
- "$(DESTDIR)$(ASTCONFPATH)" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
|
|
- $(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH)" ; \
|
|
- rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
|
|
+ "$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf" > "$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf.tmp" ; \
|
|
+ $(INSTALL) -m 644 "$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf.tmp" "$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf" ; \
|
|
+ rm -f "$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf.tmp" ; \
|
|
fi
|
|
endef
|
|
|
|
# XXX why *.adsi is installed first ?
|
|
adsi:
|
|
@echo Installing adsi config files...
|
|
- $(INSTALL) -d "$(DESTDIR)$(ASTETCDIR)"
|
|
+ $(INSTALL) -d "$(DESTDIR)$(ASTEXAMPLEDIR)"
|
|
@for x in configs/samples/*.adsi; do \
|
|
- dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \
|
|
+ dst="$(DESTDIR)$(ASTEXAMPLEDIR)/`$(BASENAME) $$x`" ; \
|
|
if [ -f "$${dst}" ] ; then \
|
|
echo "Overwriting $$x" ; \
|
|
else \
|
|
echo "Installing $$x" ; \
|
|
fi ; \
|
|
- $(INSTALL) -m 644 "$$x" "$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \
|
|
+ $(INSTALL) -m 644 "$$x" "$(DESTDIR)$(ASTEXAMPLEDIR)/`$(BASENAME) $$x`" ; \
|
|
done
|
|
|
|
samples: adsi
|
|
@@ -767,7 +765,7 @@ basic-pbx:
|
|
webvmail:
|
|
@[ -d "$(DESTDIR)$(HTTP_DOCSDIR)/" ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )
|
|
@[ -d "$(DESTDIR)$(HTTP_CGIDIR)" ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 )
|
|
- $(INSTALL) -m 4755 contrib/scripts/vmail.cgi "$(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi"
|
|
+ $(INSTALL) contrib/scripts/vmail.cgi "$(DESTDIR)$(HTTP_CGIDIR)/vmail"
|
|
$(INSTALL) -d "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk"
|
|
for x in images/*.gif; do \
|
|
$(INSTALL) -m 644 $$x "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/"; \
|
|
@@ -817,11 +815,11 @@ endif
|
|
endif
|
|
|
|
install-logrotate:
|
|
- if [ ! -d "$(DESTDIR)$(ASTETCDIR)/../logrotate.d" ]; then \
|
|
- $(INSTALL) -d "$(DESTDIR)$(ASTETCDIR)/../logrotate.d" ; \
|
|
+ if [ ! -d "$(DESTDIR)$(ASTEXAMPLEDIR)/../logrotate.d" ]; then \
|
|
+ $(INSTALL) -d "$(DESTDIR)$(ASTEXAMPLEDIR)/../logrotate.d" ; \
|
|
fi
|
|
sed 's#__LOGDIR__#$(ASTLOGDIR)#g' < contrib/scripts/asterisk.logrotate | sed 's#__SBINDIR__#$(ASTSBINDIR)#g' > contrib/scripts/asterisk.logrotate.tmp
|
|
- $(INSTALL) -m 0644 contrib/scripts/asterisk.logrotate.tmp "$(DESTDIR)$(ASTETCDIR)/../logrotate.d/asterisk"
|
|
+ $(INSTALL) -m 0644 contrib/scripts/asterisk.logrotate.tmp "$(DESTDIR)$(ASTEXAMPLEDIR)/../logrotate.d/asterisk"
|
|
rm -f contrib/scripts/asterisk.logrotate.tmp
|
|
|
|
config:
|
|
@@ -932,7 +930,7 @@ uninstall-all: _uninstall
|
|
rm -rf "$(DESTDIR)$(ASTVARLIBDIR)"
|
|
rm -rf "$(DESTDIR)$(ASTDATADIR)"
|
|
rm -rf "$(DESTDIR)$(ASTSPOOLDIR)"
|
|
- rm -rf "$(DESTDIR)$(ASTETCDIR)"
|
|
+ rm -rf "$(DESTDIR)$(ASTEXAMPLEDIR)"
|
|
rm -rf "$(DESTDIR)$(ASTLOGDIR)"
|
|
|
|
menuconfig: menuselect
|
|
@@ -1021,6 +1019,7 @@ check-alembic: makeopts
|
|
@ALEMBIC=$(ALEMBIC) build_tools/make_check_alembic config cdr voicemail >&2
|
|
|
|
.PHONY: menuselect
|
|
+.PHONY: menuselect.makeopts
|
|
.PHONY: main
|
|
.PHONY: sounds
|
|
.PHONY: clean
|