res_http_websockets: Fix extra unref of module
[asterisk/asterisk.git] / Makefile
index 09bcb5b..66a8411 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -104,7 +104,7 @@ export PYTHON
 
 # start the primary CFLAGS and LDFLAGS with any that were provided
 # to the configure script
-_ASTCFLAGS:=$(CONFIG_CFLAGS)
+_ASTCFLAGS:=$(CONFIG_CFLAGS) $(CONFIG_SIGNED_CHAR)
 _ASTLDFLAGS:=$(CONFIG_LDFLAGS)
 
 # Some build systems, such as the one in openwrt, like to pass custom target
@@ -151,6 +151,9 @@ LINKER_SYMBOL_PREFIX=
 # Uncomment this to use the older DSP routines
 #_ASTCFLAGS+=-DOLD_DSP_ROUTINES
 
+# Default install directory for DAHDI hooks.
+DAHDI_UDEV_HOOK_DIR = /usr/share/dahdi/span_config.d
+
 # 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
 # a new version of Asterisk, you don't have to run menuselect to set them.
@@ -238,7 +241,7 @@ endif
 _ASTCFLAGS+=$(OPTIONS)
 
 MOD_SUBDIRS:=channels pbx apps codecs formats cdr cel bridges funcs tests main res addons $(LOCAL_MOD_SUBDIRS)
-OTHER_SUBDIRS:=utils agi
+OTHER_SUBDIRS:=utils agi contrib
 SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_SUBDIRS)
 SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
 SUBDIRS_CLEAN:=$(SUBDIRS:%=%-clean)
@@ -589,6 +592,10 @@ bininstall: _all installdirs $(SUBDIRS_INSTALL) main-bininstall
        if [ -f contrib/firmware/iax/iaxy.bin ] ; then \
                $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin "$(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin"; \
        fi
+ifeq ($(HAVE_DAHDI),1)
+       $(INSTALL) -d $(DESTDIR)/$(DAHDI_UDEV_HOOK_DIR)
+       $(INSTALL) -m 644 contrib/scripts/dahdi_span_config_hook $(DESTDIR)$(DAHDI_UDEV_HOOK_DIR)/40-asterisk
+endif
 
 $(SUBDIRS_INSTALL):
        +@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(SUBMAKE) -C $(@:-install=) install
@@ -615,7 +622,7 @@ oldmodcheck:
        fi
 
 badshell:
-ifneq ($(findstring ~,$(DESTDIR)),)
+ifneq ($(filter ~%,$(DESTDIR)),)
        @echo "Your shell doesn't do ~ expansion when expected (specifically, when doing \"make install DESTDIR=~/path\")."
        @echo "Try replacing ~ with \$$HOME, as in \"make install DESTDIR=\$$HOME/path\"."
        @exit 1
@@ -656,7 +663,7 @@ upgrade: bininstall
 adsi:
        @echo Installing adsi config files...
        $(INSTALL) -d "$(DESTDIR)$(ASTETCDIR)"
-       @for x in configs/*.adsi; do \
+       @for x in configs/samples/*.adsi; do \
                dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \
                if [ -f "$${dst}" ] ; then \
                        echo "Overwriting $$x" ; \
@@ -668,7 +675,7 @@ adsi:
 
 samples: adsi
        @echo Installing other config files...
-       @for x in configs/*.sample; do \
+       @for x in configs/samples/*.sample; do \
                dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`" ;        \
                if [ -f "$${dst}" ]; then \
                        if [ "$(OVERWRITE)" = "y" ]; then \
@@ -783,7 +790,7 @@ install-logrotate:
        rm -f contrib/scripts/asterisk.logrotate.tmp
 
 config:
-       @if [ "${OSARCH}" = "linux-gnu" ]; then \
+       @if [ "${OSARCH}" = "linux-gnu" -o "${OSARCH}" = "kfreebsd-gnu" ]; then \
                if [ -f /etc/redhat-release -o -f /etc/fedora-release ]; then \
                        ./build_tools/install_subst contrib/init.d/rc.redhat.asterisk  "$(DESTDIR)/etc/rc.d/init.d/asterisk"; \
                        if [ ! -f "$(DESTDIR)/etc/sysconfig/asterisk" ] ; then \
@@ -866,6 +873,9 @@ _uninstall: $(SUBDIRS_UNINSTALL) main-binuninstall
        rm -f "$(DESTDIR)$(ASTMANDIR)/man8/astgenkey.8"
        rm -f "$(DESTDIR)$(ASTMANDIR)/man8/autosupport.8"
        rm -f "$(DESTDIR)$(ASTMANDIR)/man8/safe_asterisk.8"
+ifeq ($(HAVE_DAHDI),1)
+       rm -f $(DESTDIR)$(DAHDI_UDEV_HOOK_DIR)/40-asterisk
+endif
        $(MAKE) -C sounds uninstall
 
 uninstall: _uninstall