mirror of
https://github.com/Stichting-MINIX-Research-Foundation/pkgsrc-ng.git
synced 2025-08-03 17:59:07 -04:00
125 lines
5.3 KiB
Plaintext
125 lines
5.3 KiB
Plaintext
$NetBSD: patch-aa,v 1.6 2012/08/03 08:22:53 jnemeth Exp $
|
|
|
|
--- Makefile.orig 2012-06-13 14:27:57.000000000 +0000
|
|
+++ Makefile
|
|
@@ -125,7 +125,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
|
|
MODULES_DIR=$(ASTLIBDIR)/modules
|
|
AGI_DIR=$(ASTDATADIR)/agi-bin
|
|
|
|
@@ -182,10 +182,6 @@ ifeq ($(AST_DEVMODE),yes)
|
|
_ASTCFLAGS+=-Wformat=2
|
|
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)
|
|
@@ -395,7 +391,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
|
|
@@ -405,7 +400,7 @@ distclean: $(SUBDIRS_DIST_CLEAN) _clean
|
|
rm -rf doc/api
|
|
rm -f build_tools/menuselect-deps
|
|
|
|
-datafiles: _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
|
|
@@ -466,7 +461,7 @@ update:
|
|
|
|
NEWHEADERS=$(notdir $(wildcard include/asterisk/*.h))
|
|
OLDHEADERS=$(filter-out $(NEWHEADERS) $(notdir $(DESTDIR)$(ASTHEADERDIR)),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
|
|
-INSTALLDIRS="$(ASTLIBDIR)" "$(MODULES_DIR)" "$(ASTSBINDIR)" "$(ASTETCDIR)" "$(ASTVARRUNDIR)" \
|
|
+INSTALLDIRS="$(ASTLIBDIR)" "$(MODULES_DIR)" "$(ASTSBINDIR)" "$(ASTEXAMPLEDIR)" "$(ASTVARRUNDIR)" \
|
|
"$(ASTSPOOLDIR)" "$(ASTSPOOLDIR)/dictate" "$(ASTSPOOLDIR)/meetme" \
|
|
"$(ASTSPOOLDIR)/monitor" "$(ASTSPOOLDIR)/system" "$(ASTSPOOLDIR)/tmp" \
|
|
"$(ASTSPOOLDIR)/voicemail" "$(ASTHEADERDIR)" "$(ASTHEADERDIR)/doxygen" \
|
|
@@ -484,7 +479,7 @@ installdirs:
|
|
fi; \
|
|
done
|
|
|
|
-bininstall: _all installdirs $(SUBDIRS_INSTALL)
|
|
+bininstall: installdirs $(SUBDIRS_INSTALL)
|
|
$(INSTALL) -m 755 main/asterisk "$(DESTDIR)$(ASTSBINDIR)/"
|
|
$(LN) -sf asterisk "$(DESTDIR)$(ASTSBINDIR)/rasterisk"
|
|
$(INSTALL) -m 755 contrib/scripts/astgenkey "$(DESTDIR)$(ASTSBINDIR)/"
|
|
@@ -576,21 +571,21 @@ upgrade: bininstall
|
|
# XXX why *.adsi is installed first ?
|
|
adsi:
|
|
@echo Installing adsi config files...
|
|
- $(INSTALL) -d "$(DESTDIR)$(ASTETCDIR)"
|
|
+ $(INSTALL) -d "$(DESTDIR)$(ASTEXAMPLEDIR)"
|
|
@for x in configs/*.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
|
|
@echo Installing other config files...
|
|
@for x in configs/*.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 \
|
|
@@ -618,9 +613,9 @@ samples: adsi
|
|
-e 's|^astspooldir.*$$|astspooldir => $(ASTSPOOLDIR)|' \
|
|
-e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \
|
|
-e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \
|
|
- "$(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)"
|
|
@@ -646,7 +641,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 )
|
|
- $(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/"; \
|
|
@@ -799,7 +794,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
|
|
@@ -868,6 +863,7 @@ menuselect-tree: $(foreach dir,$(filter-
|
|
@echo "</menu>" >> $@
|
|
|
|
.PHONY: menuselect
|
|
+.PHONY: menuselect.makeopts
|
|
.PHONY: main
|
|
.PHONY: sounds
|
|
.PHONY: clean
|