diff options
Diffstat (limited to 'comms/asterisk13/patches/patch-Makefile')
| -rw-r--r-- | comms/asterisk13/patches/patch-Makefile | 68 |
1 files changed, 42 insertions, 26 deletions
diff --git a/comms/asterisk13/patches/patch-Makefile b/comms/asterisk13/patches/patch-Makefile index 92fc541e377..60c1f4be7c2 100644 --- a/comms/asterisk13/patches/patch-Makefile +++ b/comms/asterisk13/patches/patch-Makefile @@ -1,6 +1,6 @@ -$NetBSD: patch-Makefile,v 1.1.1.1 2015/12/05 23:29:09 jnemeth Exp $ +$NetBSD: patch-Makefile,v 1.2 2016/02/07 09:13:34 jnemeth Exp $ ---- Makefile.orig 2015-10-09 21:48:48.000000000 +0000 +--- Makefile.orig 2016-02-05 20:32:40.000000000 +0000 +++ Makefile @@ -132,7 +132,7 @@ DEBUG=-g3 @@ -62,7 +62,28 @@ $NetBSD: patch-Makefile,v 1.1.1.1 2015/12/05 23:29:09 jnemeth Exp $ "$(ASTSPOOLDIR)" "$(ASTSPOOLDIR)/dictate" "$(ASTSPOOLDIR)/meetme" \ "$(ASTSPOOLDIR)/monitor" "$(ASTSPOOLDIR)/system" "$(ASTSPOOLDIR)/tmp" \ "$(ASTSPOOLDIR)/voicemail" "$(ASTSPOOLDIR)/recording" \ -@@ -673,21 +671,21 @@ upgrade: bininstall +@@ -682,7 +680,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 \ +@@ -711,24 +709,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... @@ -81,27 +102,7 @@ $NetBSD: patch-Makefile,v 1.1.1.1 2015/12/05 23:29:09 jnemeth Exp $ done samples: adsi - @echo Installing other config files... - @for x in configs/samples/*.sample; do \ -- dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`" ; \ -+ dst="$(DESTDIR)$(ASTEXAMPLEDIR)/`$(BASENAME) $$x .sample`" ; \ - if [ -f "$${dst}" ]; then \ - if [ "$(OVERWRITE)" = "y" ]; then \ - if cmp -s "$${dst}" "$$x" ; then \ -@@ -716,9 +714,9 @@ samples: adsi - -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 ; \ - $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX" - build_tools/make_sample_voicemail "$(DESTDIR)/$(ASTDATADIR)" "$(DESTDIR)/$(ASTSPOOLDIR)" -@@ -744,7 +742,7 @@ samples: adsi +@@ -761,7 +759,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 ) @@ -110,7 +111,22 @@ $NetBSD: patch-Makefile,v 1.1.1.1 2015/12/05 23:29:09 jnemeth Exp $ $(INSTALL) -d "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk" for x in images/*.gif; do \ $(INSTALL) -m 644 $$x "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/"; \ -@@ -909,7 +907,7 @@ uninstall-all: _uninstall +@@ -811,11 +809,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: +@@ -926,7 +924,7 @@ uninstall-all: _uninstall rm -rf "$(DESTDIR)$(ASTVARLIBDIR)" rm -rf "$(DESTDIR)$(ASTDATADIR)" rm -rf "$(DESTDIR)$(ASTSPOOLDIR)" @@ -119,7 +135,7 @@ $NetBSD: patch-Makefile,v 1.1.1.1 2015/12/05 23:29:09 jnemeth Exp $ rm -rf "$(DESTDIR)$(ASTLOGDIR)" menuconfig: menuselect -@@ -994,6 +992,7 @@ else +@@ -1011,6 +1009,7 @@ else endif .PHONY: menuselect |