diff options
Diffstat (limited to 'comms/asterisk/patches/patch-Makefile')
| -rw-r--r-- | comms/asterisk/patches/patch-Makefile | 40 |
1 files changed, 11 insertions, 29 deletions
diff --git a/comms/asterisk/patches/patch-Makefile b/comms/asterisk/patches/patch-Makefile index 50a562c0152..70e5ce4802e 100644 --- a/comms/asterisk/patches/patch-Makefile +++ b/comms/asterisk/patches/patch-Makefile @@ -1,8 +1,8 @@ -$NetBSD: patch-Makefile,v 1.1 2012/12/11 08:22:48 jnemeth Exp $ +$NetBSD: patch-Makefile,v 1.2 2013/05/18 03:40:17 jnemeth Exp $ ---- Makefile.orig 2012-09-18 15:47:01.000000000 +0000 +--- Makefile.orig 2013-02-04 19:50:52.000000000 +0000 +++ Makefile -@@ -135,7 +135,7 @@ DEBUG=-g3 +@@ -130,7 +130,7 @@ DEBUG=-g3 # Asterisk.conf is located in ASTETCDIR or by using the -C flag # when starting Asterisk @@ -11,7 +11,7 @@ $NetBSD: patch-Makefile,v 1.1 2012/12/11 08:22:48 jnemeth Exp $ AGI_DIR=$(ASTDATADIR)/agi-bin # If you use Apache, you may determine by a grep 'DocumentRoot' of your httpd.conf file -@@ -202,10 +202,6 @@ ifeq ($(AST_DEVMODE),yes) +@@ -197,10 +197,6 @@ ifeq ($(AST_DEVMODE),yes) ADDL_TARGETS+=validate-docs endif @@ -22,7 +22,7 @@ $NetBSD: patch-Makefile,v 1.1 2012/12/11 08:22:48 jnemeth Exp $ 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) -@@ -439,7 +435,6 @@ dist-clean: distclean +@@ -427,7 +423,6 @@ dist-clean: distclean distclean: $(SUBDIRS_DIST_CLEAN) _clean @$(MAKE) -C menuselect dist-clean @@ -30,16 +30,7 @@ $NetBSD: patch-Makefile,v 1.1 2012/12/11 08:22:48 jnemeth Exp $ rm -f menuselect.makeopts makeopts menuselect-tree menuselect.makedeps rm -f makeopts.embed_rules rm -f config.log config.status config.cache -@@ -449,7 +444,7 @@ distclean: $(SUBDIRS_DIST_CLEAN) _clean - rm -rf doc/api - rm -f build_tools/menuselect-deps - --datafiles: _cleantest_all doc/core-en_US.xml -+datafiles: doc/core-en_US.xml - CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig "$(DESTDIR)$(libdir)/pkgconfig"; - # Should static HTTP be installed during make samples or even with its own target ala - # webvoicemail? There are portions here that *could* be customized but might also be -@@ -537,7 +532,7 @@ update: +@@ -525,7 +520,7 @@ update: NEWHEADERS=$(notdir $(wildcard include/asterisk/*.h)) OLDHEADERS=$(filter-out $(NEWHEADERS) $(notdir $(DESTDIR)$(ASTHEADERDIR)),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h))) @@ -48,16 +39,7 @@ $NetBSD: patch-Makefile,v 1.1 2012/12/11 08:22:48 jnemeth Exp $ "$(ASTSPOOLDIR)" "$(ASTSPOOLDIR)/dictate" "$(ASTSPOOLDIR)/meetme" \ "$(ASTSPOOLDIR)/monitor" "$(ASTSPOOLDIR)/system" "$(ASTSPOOLDIR)/tmp" \ "$(ASTSPOOLDIR)/voicemail" "$(ASTHEADERDIR)" "$(ASTHEADERDIR)/doxygen" \ -@@ -558,7 +553,7 @@ installdirs: - main-bininstall: - +@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" ASTLIBDIR="$(ASTLIBDIR)" $(SUBMAKE) -C main bininstall - --bininstall: _cleantest_all installdirs $(SUBDIRS_INSTALL) main-bininstall -+bininstall: installdirs $(SUBDIRS_INSTALL) main-bininstall - $(INSTALL) -m 755 contrib/scripts/astgenkey "$(DESTDIR)$(ASTSBINDIR)/" - $(INSTALL) -m 755 contrib/scripts/autosupport "$(DESTDIR)$(ASTSBINDIR)/" - if [ ! -f "$(DESTDIR)$(ASTSBINDIR)/safe_asterisk" -a ! -f /sbin/launchd ]; then \ -@@ -648,21 +643,21 @@ upgrade: bininstall +@@ -636,21 +631,21 @@ upgrade: bininstall # XXX why *.adsi is installed first ? adsi: @echo Installing adsi config files... @@ -83,7 +65,7 @@ $NetBSD: patch-Makefile,v 1.1 2012/12/11 08:22:48 jnemeth Exp $ if [ -f "$${dst}" ]; then \ if [ "$(OVERWRITE)" = "y" ]; then \ if cmp -s "$${dst}" "$$x" ; then \ -@@ -691,9 +686,9 @@ samples: adsi +@@ -679,9 +674,9 @@ samples: adsi -e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \ -e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \ -e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \ @@ -96,7 +78,7 @@ $NetBSD: patch-Makefile,v 1.1 2012/12/11 08:22:48 jnemeth Exp $ fi ; \ $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX" build_tools/make_sample_voicemail "$(DESTDIR)/$(ASTDATADIR)" "$(DESTDIR)/$(ASTSPOOLDIR)" -@@ -719,7 +714,7 @@ samples: adsi +@@ -707,7 +702,7 @@ samples: adsi 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 ) @@ -105,7 +87,7 @@ $NetBSD: patch-Makefile,v 1.1 2012/12/11 08:22:48 jnemeth Exp $ $(INSTALL) -d "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk" for x in images/*.gif; do \ $(INSTALL) -m 644 $$x "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/"; \ -@@ -875,7 +870,7 @@ uninstall-all: _uninstall +@@ -863,7 +858,7 @@ uninstall-all: _uninstall rm -rf "$(DESTDIR)$(ASTVARLIBDIR)" rm -rf "$(DESTDIR)$(ASTDATADIR)" rm -rf "$(DESTDIR)$(ASTSPOOLDIR)" @@ -114,7 +96,7 @@ $NetBSD: patch-Makefile,v 1.1 2012/12/11 08:22:48 jnemeth Exp $ rm -rf "$(DESTDIR)$(ASTLOGDIR)" menuconfig: menuselect -@@ -946,6 +941,7 @@ menuselect-tree: $(foreach dir,$(filter- +@@ -934,6 +929,7 @@ menuselect-tree: $(foreach dir,$(filter- @echo "</menu>" >> $@ .PHONY: menuselect |