diff options
Diffstat (limited to 'net/asterisk15/files/patch-Makefile')
| -rw-r--r-- | net/asterisk15/files/patch-Makefile | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/net/asterisk15/files/patch-Makefile b/net/asterisk15/files/patch-Makefile index a5e1188fd8be..9f568d4ce4b9 100644 --- a/net/asterisk15/files/patch-Makefile +++ b/net/asterisk15/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2017-12-20 20:39:39 UTC +--- Makefile.orig 2018-08-28 19:19:14 UTC +++ Makefile -@@ -138,7 +138,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR)) +@@ -141,7 +141,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR)) OVERWRITE=y # Include debug and macro symbols in the executables (-g) and profiling info (-pg) @@ -9,7 +9,7 @@ # Asterisk.conf is located in ASTETCDIR or by using the -C flag # when starting Asterisk -@@ -162,7 +162,7 @@ LINKER_SYMBOL_PREFIX= +@@ -165,7 +165,7 @@ LINKER_SYMBOL_PREFIX= #_ASTCFLAGS+=-DOLD_DSP_ROUTINES # Default install directory for DAHDI hooks. @@ -18,7 +18,7 @@ # If the file .asterisk.makeopts is present in your home directory, you can # include all of your favorite menuselect options so that every time you download -@@ -220,7 +220,7 @@ endif +@@ -225,7 +225,7 @@ endif ifeq ($(OSARCH),FreeBSD) # -V is understood by BSD Make, not by GNU make. @@ -27,7 +27,7 @@ _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) endif -@@ -456,8 +456,12 @@ endif +@@ -465,8 +465,12 @@ endif $(INSTALL) -m 644 $$n "$(DESTDIR)$(ASTDATADIR)/static-http/docs" ; \ done \ fi @@ -41,7 +41,7 @@ done $(MAKE) -C sounds install find rest-api -name "*.json" | while read x; do \ -@@ -552,7 +556,7 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDI +@@ -565,7 +569,7 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDI "$(ASTDATADIR)/firmware/iax" "$(ASTDATADIR)/images" "$(ASTDATADIR)/keys" \ "$(ASTDATADIR)/phoneprov" "$(ASTDATADIR)/rest-api" "$(ASTDATADIR)/static-http" \ "$(ASTDATADIR)/sounds" "$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)" \ @@ -50,7 +50,7 @@ installdirs: @for i in $(INSTALLDIRS); do \ -@@ -591,10 +595,10 @@ endif +@@ -604,10 +608,10 @@ endif if [ -f contrib/firmware/iax/iaxy.bin ] ; then \ $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin "$(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin"; \ fi @@ -65,7 +65,7 @@ $(SUBDIRS_INSTALL): +@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" ASTDATADIR="$(ASTDATADIR)" $(SUBMAKE) -C $(@:-install=) install -@@ -702,7 +706,7 @@ ifneq ($(filter ~%,$(DESTDIR)),) +@@ -722,7 +726,7 @@ ifneq ($(filter ~%,$(DESTDIR)),) @exit 1 endif @@ -74,10 +74,10 @@ @if [ -x /usr/sbin/asterisk-post-install ]; then \ /usr/sbin/asterisk-post-install "$(DESTDIR)" . ; \ fi -@@ -747,23 +751,10 @@ upgrade: bininstall +@@ -767,23 +771,10 @@ upgrade: bininstall # (2) the extension to strip off define INSTALL_CONFIGS - @for x in configs/$(1)/*$(2); do \ + @for x in $(1)/*$(2); do \ - dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x $(2)`"; \ - if [ -f "$${dst}" ]; then \ - if [ "$(OVERWRITE)" = "y" ]; then \ @@ -93,14 +93,14 @@ - fi ; \ echo "Installing file $$x"; \ - $(INSTALL) -m 644 "$$x" "$${dst}" ;\ -+ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`.sample ; \ ++ $(INSTALL) -m 644 "$$x" "$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`.sample" ; \ done ; \ - if [ "$(OVERWRITE)" = "y" ]; then \ + if true; then \ echo "Updating asterisk.conf" ; \ sed -e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \ -e 's|^astmoddir.*$$|astmoddir => $(ASTMODDIR)|' \ -@@ -776,8 +767,8 @@ define INSTALL_CONFIGS +@@ -796,8 +787,8 @@ define INSTALL_CONFIGS -e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \ -e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \ -e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \ @@ -111,7 +111,7 @@ rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \ fi endef -@@ -793,7 +784,7 @@ adsi: +@@ -821,7 +812,7 @@ adsi: else \ echo "Installing $$x" ; \ fi ; \ |