optionally install pinned files: --enable-pinned
Add installation of the pinned-spans support to the Makefile. For the moment, however, they are not installed unless you use ./configure --enable-pinned or build with 'make DAHDI_PINNED=yes' Signed-off-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com> Signed-off-by: Russ Meyerriecks <rmeyerriecks@digium.com>
This commit is contained in:
parent
ba3289ac9a
commit
3d1fd71af2
12
Makefile
12
Makefile
|
@ -88,6 +88,7 @@ BIN_DIR:=$(sbindir)
|
||||||
LIB_DIR:=$(libdir)
|
LIB_DIR:=$(libdir)
|
||||||
INC_DIR:=$(includedir)/dahdi
|
INC_DIR:=$(includedir)/dahdi
|
||||||
MAN_DIR:=$(mandir)/man8
|
MAN_DIR:=$(mandir)/man8
|
||||||
|
DATA_DIR:=${datadir}/dahdi
|
||||||
CONFIG_DIR:=$(sysconfdir)/dahdi
|
CONFIG_DIR:=$(sysconfdir)/dahdi
|
||||||
CONFIG_FILE:=$(CONFIG_DIR)/system.conf
|
CONFIG_FILE:=$(CONFIG_DIR)/system.conf
|
||||||
|
|
||||||
|
@ -109,6 +110,11 @@ ifeq (1,$(PBX_HDLC))
|
||||||
endif
|
endif
|
||||||
MAN_PAGES:=$(wildcard $(BINS:%=doc/%.8))
|
MAN_PAGES:=$(wildcard $(BINS:%=doc/%.8))
|
||||||
|
|
||||||
|
PINNED_DATA_SCRIPTS:=dahdi_cfg_device_args handle_device \
|
||||||
|
span_assignments span_types
|
||||||
|
PINNED_UTILS:=dahdi_map
|
||||||
|
PINNED_CONF:=pinned-spans.conf spantype.conf
|
||||||
|
|
||||||
TEST_BINS:=patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest dahdi_maint
|
TEST_BINS:=patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest dahdi_maint
|
||||||
# All the man pages. Not just installed ones:
|
# All the man pages. Not just installed ones:
|
||||||
GROFF_PAGES := $(wildcard doc/*.8 xpp/*.8)
|
GROFF_PAGES := $(wildcard doc/*.8 xpp/*.8)
|
||||||
|
@ -227,6 +233,12 @@ ifeq (,$(wildcard $(DESTDIR)$(CONFIG_FILE)))
|
||||||
$(INSTALL) -d $(DESTDIR)$(CONFIG_DIR)
|
$(INSTALL) -d $(DESTDIR)$(CONFIG_DIR)
|
||||||
$(INSTALL) -m 644 system.conf.sample $(DESTDIR)$(CONFIG_FILE)
|
$(INSTALL) -m 644 system.conf.sample $(DESTDIR)$(CONFIG_FILE)
|
||||||
endif
|
endif
|
||||||
|
ifeq ($(DAHDI_PINNED),yes)
|
||||||
|
install -d $(DESTDIR)$(DATA_DIR)
|
||||||
|
install $(PINNED_DATA_SCRIPTS) $(DESTDIR)$(DATA_DIR)/
|
||||||
|
install $(PINNED_UTILS) $(DESTDIR)/$(BIN_DIR)/
|
||||||
|
install -m 644 $(PINNED_CONF) $(DESTDIR)/$(CONFIG_DIR)/
|
||||||
|
endif
|
||||||
|
|
||||||
install-libs: libs
|
install-libs: libs
|
||||||
$(INSTALL) -d -m 755 $(DESTDIR)/$(LIB_DIR)
|
$(INSTALL) -d -m 755 $(DESTDIR)/$(LIB_DIR)
|
||||||
|
|
|
@ -79,6 +79,15 @@ AC_ARG_ENABLE(dev-mode,
|
||||||
esac])
|
esac])
|
||||||
AC_SUBST(DAHDI_DEVMODE)
|
AC_SUBST(DAHDI_DEVMODE)
|
||||||
|
|
||||||
|
AC_ARG_ENABLE(pinned,
|
||||||
|
[ --enable-pinned Install pinned-spans support],
|
||||||
|
[case "${enableval}" in
|
||||||
|
y|ye|yes) DAHDI_PINNED=yes ;;
|
||||||
|
n|no) DAHDI_PINNED=no ;;
|
||||||
|
*) AC_MSG_ERROR(bad value ${enableval} for --enable-pinned) ;;
|
||||||
|
esac])
|
||||||
|
AC_SUBST(DAHDI_PINNED)
|
||||||
|
|
||||||
AC_MSG_CHECKING(for -Wdeclaration-after-statement support)
|
AC_MSG_CHECKING(for -Wdeclaration-after-statement support)
|
||||||
if $(${CC} -Wdeclaration-after-statement -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then
|
if $(${CC} -Wdeclaration-after-statement -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then
|
||||||
AC_MSG_RESULT(yes)
|
AC_MSG_RESULT(yes)
|
||||||
|
|
|
@ -30,6 +30,8 @@ DOWNLOAD=@DOWNLOAD@
|
||||||
DAHDI_DEVMODE=@DAHDI_DEVMODE@
|
DAHDI_DEVMODE=@DAHDI_DEVMODE@
|
||||||
DAHDI_DECLARATION_AFTER_STATEMENT=@DAHDI_DECLARATION_AFTER_STATEMENT@
|
DAHDI_DECLARATION_AFTER_STATEMENT=@DAHDI_DECLARATION_AFTER_STATEMENT@
|
||||||
|
|
||||||
|
DAHDI_PINNED=@DAHDI_PINNED@
|
||||||
|
|
||||||
PBX_NEWT=@PBX_NEWT@
|
PBX_NEWT=@PBX_NEWT@
|
||||||
NEWT_LIB=@NEWT_LIB@
|
NEWT_LIB=@NEWT_LIB@
|
||||||
NEWT_INCLUDE=@NEWT_INCLUDE@
|
NEWT_INCLUDE=@NEWT_INCLUDE@
|
||||||
|
|
Loading…
Reference in New Issue