proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-13 19:02:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add support for --enable-exampledir to specify where to place example

Browse Source 
files, defaulting to sysconfdir (matching previous behavior).

This is needed to support (cleanly) NetBSD pkgsrc, which requires that
example config files go in $(prefix)/share/examples/pkgname, rather
than in $(prefix)/etc/pkgname.
This commit is contained in:
gdt 2003-12-03 17:24:27 +00:00
parent 6c110e700c
commit d6b72f7ab1
9 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2003-12-03 Greg Troxel <gdt@poblano.ir.bbn.com>
* configure.ac: Add --enable-exampledir to specify where example
config files should go, defaulting to sysconfdir.
* */Makefile.am: use exampledir instead of sysconfdif for examples
2003-11-02 Paul Jakma <paul@dishone.st> 2003-11-02 Paul Jakma <paul@dishone.st>
* bgpd/bgp_routemap.c: Fix up 'set ip next-hop A.B.C.D|peer-address' * bgpd/bgp_routemap.c: Fix up 'set ip next-hop A.B.C.D|peer-address'

3
bgpd/Makefile.am
View File

@ -26,7 +26,8 @@ bgpd_SOURCES = \
bgpd_LDADD = ../lib/libzebra.a @LIBCAP@ bgpd_LDADD = ../lib/libzebra.a @LIBCAP@
dist_sysconf_DATA = bgpd.conf.sample bgpd.conf.sample2 examplesdir = $(exampledir)
dist_examples_DATA = bgpd.conf.sample bgpd.conf.sample2
EXTRA_DIST = BGP4-MIB.txt EXTRA_DIST = BGP4-MIB.txt

10
configure.ac
View File

@ -12,6 +12,15 @@ AC_CONFIG_SRCDIR(lib/zebra.h)
AM_INIT_AUTOMAKE() AM_INIT_AUTOMAKE()
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
dnl default is to match previous behavior
exampledir='${sysconfdir}'
AC_ARG_ENABLE([exampledir],
AC_HELP_STRING([--enable-exampledir],
[specify alternate directory for examples]),
exampledir="$enableval",)
dnl XXX hook into argument processing
AC_SUBST(exampledir)
dnl ----------------------------------- dnl -----------------------------------
dnl Get hostname and other information. dnl Get hostname and other information.
dnl ----------------------------------- dnl -----------------------------------
@ -1056,6 +1065,7 @@ compiler flags : ${CFLAGS}
linker flags : ${LDFLAGS} ${LIBS} linker flags : ${LDFLAGS} ${LIBS}
state file directory : ${quagga_statedir} state file directory : ${quagga_statedir}
config file directory : `eval echo \`echo ${sysconfdir}\`` config file directory : `eval echo \`echo ${sysconfdir}\``
example directory : `eval echo \`echo ${exampledir}\``
user to run as : ${enable_user} user to run as : ${enable_user}
group to run as : ${enable_group} group to run as : ${enable_group}
group for vty sockets : ${enable_vty_group} group for vty sockets : ${enable_vty_group}

3
ospf6d/Makefile.am
View File

@ -30,4 +30,5 @@ ospf6d_SOURCES = \
ospf6d_LDADD = -L../lib -lzebra @LIBCAP@ ospf6d_LDADD = -L../lib -lzebra @LIBCAP@
dist_sysconf_DATA = ospf6d.conf.sample examplesdir = $(exampledir)
dist_examples_DATA = ospf6d.conf.sample

3
ospfd/Makefile.am
View File

@ -32,5 +32,6 @@ ospfd_LDADD = -L../lib -lzebra @LIBCAP@
EXTRA_DIST = OSPF-MIB.txt OSPF-TRAP-MIB.txt ChangeLog.opaque.txt EXTRA_DIST = OSPF-MIB.txt OSPF-TRAP-MIB.txt ChangeLog.opaque.txt
dist_sysconf_DATA = ospfd.conf.sample examplesdir = $(exampledir)
dist_examples_DATA = ospfd.conf.sample

3
ripd/Makefile.am
View File

@ -19,7 +19,8 @@ ripd_SOURCES = \
ripd_LDADD = -L../lib -lzebra @LIBCAP@ ripd_LDADD = -L../lib -lzebra @LIBCAP@
dist_sysconf_DATA = ripd.conf.sample examplesdir = $(exampledir)
dist_examples_DATA = ripd.conf.sample
EXTRA_DIST = RIPv2-MIB.txt EXTRA_DIST = RIPv2-MIB.txt

3
ripngd/Makefile.am
View File

@ -19,5 +19,6 @@ ripngd_SOURCES = \
ripngd_LDADD = -L../lib -lzebra @LIBCAP@ ripngd_LDADD = -L../lib -lzebra @LIBCAP@
dist_sysconf_DATA = ripngd.conf.sample examplesdir = $(exampledir)
dist_examples_DATA = ripngd.conf.sample

5
vtysh/Makefile.am
View File

@ -12,9 +12,10 @@ nodist_vtysh_SOURCES = vtysh_cmd.c
noinst_HEADERS = vtysh.h vtysh_user.h noinst_HEADERS = vtysh.h vtysh_user.h
vtysh_LDADD = ../lib/libzebra.a @LIBCAP@ vtysh_LDADD = ../lib/libzebra.a @LIBCAP@
sysconf_DATA = vtysh.conf.sample examplesdir = $(exampledir)
dist_examples_DATA = vtysh.conf.sample
EXTRA_DIST = extract.pl vtysh.conf.sample EXTRA_DIST = extract.pl
rebuild4: rebuild4:
./extract.pl $(top_srcdir)/zebra/*.c $(top_srcdir)/ripd/*.c $(top_srcdir)/ospfd/*.c $(top_srcdir)/bgpd/*.c $(top_srcdir)/lib/keychain.c $(top_srcdir)/lib/routemap.c $(top_srcdir)/lib/filter.c $(top_srcdir)/lib/plist.c $(top_srcdir)/lib/distribute.c $(top_srcdir)/lib/if_rmap.c > vtysh_cmd.c ./extract.pl $(top_srcdir)/zebra/*.c $(top_srcdir)/ripd/*.c $(top_srcdir)/ospfd/*.c $(top_srcdir)/bgpd/*.c $(top_srcdir)/lib/keychain.c $(top_srcdir)/lib/routemap.c $(top_srcdir)/lib/filter.c $(top_srcdir)/lib/plist.c $(top_srcdir)/lib/distribute.c $(top_srcdir)/lib/if_rmap.c > vtysh_cmd.c

4
zebra/Makefile.am
View File

@ -43,4 +43,6 @@ EXTRA_DIST = if_ioctl.c if_netlink.c if_proc.c if_sysctl.c \
# $(CC) -g -o client client_main.o ../lib/libzebra.a $(LIBS) $(LIB_IPV6) # $(CC) -g -o client client_main.o ../lib/libzebra.a $(LIBS) $(LIB_IPV6)
quaggaconfdir = $(sysconfdir) quaggaconfdir = $(sysconfdir)
dist_quaggaconf_DATA = zebra.conf.sample
examplesdir = $(exampledir)
dist_examples_DATA = zebra.conf.sample