retronetworking
/
isdn4k-utils
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* have a seperate config directory for firmware 

* have a seperate config directory for card tools
This commit is contained in:
Karsten Keil 2005-02-21 17:52:09 +00:00
parent dcc861f344
commit 78acb431e8
14 changed files with 48 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -5,7 +5,7 @@
.EXPORT_ALL_VARIABLES:
export I4LVERSION = 3.6
export I4LVERSION = 3.7
all: do-it-all

4
act2000/configure.in
View File

@ -4,9 +4,9 @@ AC_PREFIX_DEFAULT(/usr)
I4LCONFDIR=${I4LCONFDIR:-"/etc/isdn"}
I4LVERSION=${I4LVERSION:-"?.?"}
CONFIG_DATADIR=${CONFIG_DATADIR:-"/usr/lib/isdn"}
CONFIG_DATADIR=${CONFIG_FIRMWAREDIR:-"/usr/lib/isdn"}
CONFIG_MANDIR=`eval echo ${CONFIG_MANDIR:-"/usr/man"}`
CONFIG_SBINDIR=`eval echo ${CONFIG_SBINDIR:-"/sbin"}`
CONFIG_SBINDIR=`eval echo ${CONFIG_CARD_SBINDIR:-"/sbin"}`
MANDATE=`grep CHECKIN actctrl.man.in | awk '{print $4}'`
dnl Checks for programs.

4
avmb1/configure.in
View File

@ -8,9 +8,9 @@ AC_PROG_INSTALL
I4LCONFDIR=${I4LCONFDIR:-"/etc/isdn"}
I4LVERSION=${I4LVERSION:-"?.?"}
CONFIG_DATADIR=${CONFIG_DATADIR:-"/usr/lib/isdn"}
CONFIG_DATADIR=${CONFIG_FIRMWAREDIR:-"/usr/lib/isdn"}
CONFIG_MANDIR=`eval echo ${CONFIG_MANDIR:-"/usr/man"}`
CONFIG_SBINDIR=`eval echo ${CONFIG_SBINDIR:-"/sbin"}`
CONFIG_SBINDIR=`eval echo ${CONFIG_CARD_SBINDIR:-"/sbin"}`
MANDATE=`grep CHECKIN avmcapictrl.man.in | awk '{print $4}'`
dnl Checks for libraries.

4
capiinit/capiinit.c
View File

@ -2,6 +2,9 @@
* $Id$
*
* $Log$
* Revision 1.16 2004/01/19 09:15:57 calle
* Always use capifs, don't trust devfs.
*
* Revision 1.15 2004/01/16 15:27:12 calle
* remove several warnings.
*
@ -87,6 +90,7 @@ static char capidevnamenew[] = "/dev/isdn/capi20";
static char *capidevname = capidevnameold;
static char *firmwarepath[] = {
"/lib/firmware/isdn",
"/usr/share/isdn",
"/usr/lib/isdn",
"/lib/isdn",

6
capiinit/configure.in
View File

@ -1,7 +1,10 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(capiinit.c)
AM_INIT_AUTOMAKE(capiinit, 1.0)
AC_PREFIX_DEFAULT(/usr)
AC_PREFIX_DEFAULT(/)
CONFIG_SBINDIR$=${CONFIG_CARD_SBINDIR:-"/sbin"}
dnl Checks for programs.
AC_PROG_INSTALL
@ -20,5 +23,6 @@ dnl Checks for typedefs, structures, and compiler characteristics.
AC_SUBST(INSTALL)
AC_SUBST(CONFIG_SBINDIR)
AC_SUBST(CONFIG_MANDIR)
AC_SUBST(CONFIG_FIRMWAREDIR)
AM_CONFIG_HEADER(config.h)
AC_OUTPUT(Makefile)

13
doc/Configure.help
View File

@ -44,6 +44,12 @@ CONFIG_SBINDIR
administrative programs. All other programs are installed in
another directory, configurable in the previous option.
Directory to install card configuration tools
CONFIG_CARD_SBINDIR
This option tess the installation process, where to put the
card configurationtools. All other programs are installed in
another directories, configurable in the previous options.
Directory to install man pages
CONFIG_MANDIR
This option tells the installation process, where to put the
@ -51,6 +57,11 @@ CONFIG_MANDIR
man pages go into some subdirectory below this directory
depending on the section they belong to.
Directory to install firmware
CONFIG_FIRMWAREDIR
With this option, the directory for the firmware images of
the various active cards can be selected.
CONFIG_RUNDIR
Some applications create special files for managing their
process IDs. This option selects the directory where to create
@ -110,7 +121,7 @@ CONFIG_LIB_AREACODE
CONFIG_DATADIR
With this option, the directory for the areacode database and
the firmware images of the various active cards can be selected.
other databases can be selected.
Build isdnctrl tool
CONFIG_ISDNCTRL

13
eicon/Makefile.in
View File

@ -18,6 +18,7 @@ DIVALOGPROGRAM = divalog
DIVAPROGRAMS = $(DIVALOADPROGRAM) $(DIVALOGDPROGRAM) $(DIVALOGPROGRAM)
MANPAGE = eiconctrl.8
INSTALL = @INSTALL@
CARDSBINDIR = @CONFIG_CARD_SBINDIR@
SBINDIR = @CONFIG_SBINDIR@
DATA_DIR = @CONFIG_DATADIR@
MANDIR = @CONFIG_MANDIR@
@ -98,25 +99,25 @@ install-man: $(PROGRAM).man
$(INSTALL_MAN) $< $(DESTDIR)$(MAN8DIR)/$(MANPAGE)
install: all install-man install-data
$(INSTALL_PROGRAM) $(PROGRAM) $(DESTDIR)$(SBINDIR)/$(PROGRAM)
$(INSTALL_PROGRAM) $(PROGRAM) $(DESTDIR)$(CARDSBINDIR)/$(PROGRAM)
ifeq ("@HAVE_NATIVE@","n")
$(INSTALL_PROGRAM) $(DIVALOADPROGRAM) $(DESTDIR)$(SBINDIR)/$(DIVALOADPROGRAM)
$(INSTALL_PROGRAM) $(DIVALOADPROGRAM) $(DESTDIR)$(CARDSBINDIR)/$(DIVALOADPROGRAM)
$(INSTALL_PROGRAM) $(DIVALOGDPROGRAM) $(DESTDIR)$(SBINDIR)/$(DIVALOGDPROGRAM)
$(INSTALL_PROGRAM) $(DIVALOGPROGRAM) $(DESTDIR)$(SBINDIR)/$(DIVALOGPROGRAM)
endif
install-strip: all
$(INSTALL_PROGRAM) -s $(PROGRAM) $(DESTDIR)$(SBINDIR)/$(PROGRAM)
$(INSTALL_PROGRAM) -s $(PROGRAM) $(DESTDIR)$(CARDSBINDIR)/$(PROGRAM)
ifeq ("@HAVE_NATIVE@","n")
$(INSTALL_PROGRAM) -s $(DIVALOADPROGRAM) $(DESTDIR)$(SBINDIR)/$(DIVALOADPROGRAM)
$(INSTALL_PROGRAM) -s $(DIVALOADPROGRAM) $(DESTDIR)$(CARDSBINDIR)/$(DIVALOADPROGRAM)
$(INSTALL_PROGRAM) -s $(DIVALOGDPROGRAM) $(DESTDIR)$(SBINDIR)/$(DIVALOGDPROGRAM)
$(INSTALL_PROGRAM) -s $(DIVALOGPROGRAM) $(DESTDIR)$(SBINDIR)/$(DIVALOGPROGRAM)
endif
uninstall:
rm -f $(DESTDIR)$(SBINDIR)/$(PROGRAM) $(DESTDIR)$(MAN8DIR)/$(MANPAGE)
rm -f $(DESTDIR)$(CARDSBINDIR)/$(PROGRAM) $(DESTDIR)$(MAN8DIR)/$(MANPAGE)
ifeq ("@HAVE_NATIVE@","n")
rm -f $(DESTDIR)$(SBINDIR)/$(DIVALOADPROGRAM)
rm -f $(DESTDIR)$(CARDSBINDIR)/$(DIVALOADPROGRAM)
rm -f $(DESTDIR)$(SBINDIR)/$(DIVALOGDPROGRAM)
rm -f $(DESTDIR)$(SBINDIR)/$(DIVALOGPROGRAM)
endif

6
eicon/configure.in
View File

@ -3,8 +3,9 @@ AC_INIT(eiconctrl.c)
AC_PREFIX_DEFAULT("/usr")
I4LVERSION=${I4LVERSION:-"?.?"}
CONFIG_DATADIR=${CONFIG_DATADIR:-"/usr/lib/isdn/eicon"}
CONFIG_SBINDIR=${CONFIG_SBINDIR:-"/sbin"}
CONFIG_DATADIR=${CONFIG_FIRMWAREDIR:-"/usr/lib/isdn/eicon"}
CONFIG_SBINDIR=${CONFIG_SBINDIR:-"/usr/sbin"}
CONFIG_CARD_SBINDIR=${CONFIG_CARD_SBINDIR:-"/sbin"}
CONFIG_MANDIR=${CONFIG_MANDIR:-"/usr/man"}
CONFIG_EICONCTRL_DEBUG=${CONFIG_EICONCTRL_DEBUG:-"n"}
MANDATE=`grep CHECKIN eiconctrl.man.in | awk '{print $4}'`
@ -75,6 +76,7 @@ AC_SUBST(CONFIG_EICONCTRL_DEBUG)
AC_SUBST(CONFIG_DATADIR)
AC_SUBST(CONFIG_KERNELDIR)
AC_SUBST(CONFIG_SBINDIR)
AC_SUBST(CONFIG_CARD_SBINDIR)
AC_SUBST(CONFIG_MANDIR)
AC_SUBST(I4LVERSION)
AC_CONFIG_HEADER(config.h)

4
hisax/configure.in
View File

@ -4,8 +4,8 @@ AC_PREFIX_DEFAULT(/usr)
I4LCONFDIR=${I4LCONFDIR:-"/etc/isdn"}
I4LVERSION=${I4LVERSION:-"?.?"}
CONFIG_SBINDIR=${CONFIG_SBINDIR:-"/sbin"}
CONFIG_DATADIR=${CONFIG_DATADIR:-"/usr/lib/isdn"}
CONFIG_SBINDIR=${CONFIG_CARD_SBINDIR:-"/sbin"}
CONFIG_DATADIR=${CONFIG_FIRMWAREDIR:-"/usr/lib/isdn"}
CONFIG_MANDIR=${CONFIG_MANDIR:-"/usr/man"}
CONFIG_TELESCTRL=${CONFIG_TELESCTRL:-"n"}
CONFIG_HISAXCTRL=${CONFIG_HISAXCTRL:-"n"}

4
icn/configure.in
View File

@ -3,8 +3,8 @@ AC_INIT(icnctrl.c)
AC_PREFIX_DEFAULT("/usr")
I4LVERSION=${I4LVERSION:-"?.?"}
CONFIG_DATADIR=${CONFIG_DATADIR:-"/usr/lib/isdn"}
CONFIG_SBINDIR=${CONFIG_SBINDIR:-"/sbin"}
CONFIG_DATADIR=${CONFIG_FIRMWAREDIR:-"/usr/lib/isdn"}
CONFIG_SBINDIR=${CONFIG_CARD_SBINDIR:-"/sbin"}
CONFIG_MANDIR=${CONFIG_MANDIR:-"/usr/man"}
CONFIG_ICNCTRL_DEBUG=${CONFIG_ICNCTRL_DEBUG:-"n"}
MANDATE=`grep CHECKIN icnctrl.man.in | awk '{print $4}'`

2
isdnctrl/configure.in
View File

@ -5,7 +5,7 @@ AC_PREFIX_DEFAULT(/usr)
I4LCONFDIR=`eval echo ${CONFIG_I4LCONFDIR:-"/etc/isdn"}`
I4LCONFFILE=`eval echo ${CONFIG_CONFFILE:-"/etc/isdn"}`
I4LVERSION=${I4LVERSION:-"?.?"}
CONFIG_SBINDIR=${CONFIG_SBINDIR:-"/sbin"}
CONFIG_SBINDIR=${CONFIG_CARD_SBINDIR:-"/sbin"}
CONFIG_MANDIR=${CONFIG_MANDIR:-"/usr/man"}
CONFIG_ISDNCTRL_CONF=${CONFIG_ISDNCTRL_CONF:-"n"}
CONFIG_ISDNCTRL_DWABC_UDP_INFO=${CONFIG_ISDNCTRL_DWABC_UDP_INFO:-"n"}

2
pcbit/configure.in
View File

@ -3,7 +3,7 @@ AC_INIT(convhexbin.c)
AC_PREFIX_DEFAULT(/usr)
I4LVERSION=${I4LVERSION:-"?.?"}
CONFIG_SBINDIR=${CONFIG_SBINDIR:-"/sbin"}
CONFIG_SBINDIR=${CONFIG_CARD_SBINDIR:-"/sbin"}
CONFIG_MANDIR=${CONFIG_MANDIR:-"/usr/man"}
MANDATE=`grep CHECKIN pcbitctl.man.in | awk '{print $4}'`
dnl Checks for programs.

3
scripts/config.in
View File

@ -25,7 +25,9 @@ string 'Kernel source directory' CONFIG_KERNELDIR
comment 'Destination directories'
string 'Directory to install binaries' CONFIG_BINDIR
string 'Directory to install admin binaries' CONFIG_SBINDIR
string 'Directory to install card configuration tools' CONFIG_CARD_SBINDIR
string 'Directory to install man pages' CONFIG_MANDIR
string 'Directory to install firmware' CONFIG_FIRMWAREDIR
comment 'Runtime defaults'
string 'Write .pid files here' CONFIG_RUNDIR
string 'Write lock files here' CONFIG_LOCKDIR
@ -68,6 +70,7 @@ bool 'icnctrl' CONFIG_ICNCTRL
if [ "$CONFIG_ICNCTRL" = "y" ]; then
bool 'Enable icnctrl debug-option' CONFIG_ICNCTRL_DEBUG
fi
bool 'actctrl' CONFIG_ACTCTRL
bool 'pcbitctl' CONFIG_PCBITCTL
bool 'avmcapictrl / capiinit' CONFIG_AVMCAPICTRL
if [ -f $CONFIG_KERNELDIR/drivers/isdn/act2000/act2000.h ] ; then

2
scripts/defconfig
View File

@ -14,7 +14,9 @@ CONFIG_BUILDX11=y
CONFIG_KERNELDIR='/usr/src/linux'
CONFIG_BINDIR='/usr/bin'
CONFIG_SBINDIR='/sbin'
CONFIG_CARD_SBINDIR='/sbin'
CONFIG_MANDIR='/usr/man'
CONFIG_FIRMWAREDIR='/usr/lib/isdn'
CONFIG_RUNDIR='/var/run'
CONFIG_LOCKDIR='/var/lock'
CONFIG_LOCKFILE='LCK..'