matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

2004-08-31 Greg Troxel <gdt@poblano.ir.bbn.com>

Browse source 
* Rename scripts to *.sh.in, and use autoconf-style substitution
	  for prefix and localstatedir.
This commit is contained in:
gdt 2004-08-31 18:16:36 +00:00
parent 630e48072a
commit cbd040847d
11 changed files with 66 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2004-08-31 Greg Troxel <gdt@poblano.ir.bbn.com>
* Makefile.am: Only put pkgsrc dir in SUBDIRS if we should install
rc.d files. (Note that pkgsrc is always in DIST_SUBDIRS.)
* configure.ac (pkgsrcdir): add new --enable-pkgsrcrcdir to give a
directory into which www.pkgsrc.org-style rc.d files are
installed.
2004-08-19 Paul Jakma <paul@dishone.st> 2004-08-19 Paul Jakma <paul@dishone.st>
* Makefile.am: add m4 directory to EXTRA_DIST, and define * Makefile.am: add m4 directory to EXTRA_DIST, and define

2
Makefile.am
View file

@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in. ## Process this file with automake to produce Makefile.in.
SUBDIRS = lib @ZEBRA@ @BGPD@ @RIPD@ @RIPNGD@ @OSPFD@ @OSPF6D@ \ SUBDIRS = lib @ZEBRA@ @BGPD@ @RIPD@ @RIPNGD@ @OSPFD@ @OSPF6D@ \
@ISISD@ @VTYSH@ @OSPFCLIENT@ pkgsrc redhat doc @ISISD@ @VTYSH@ @OSPFCLIENT@ @pkgsrcdir@ redhat doc
DIST_SUBDIRS = lib zebra bgpd ripd ripngd ospfd ospf6d \ DIST_SUBDIRS = lib zebra bgpd ripd ripngd ospfd ospf6d \
isisd vtysh ospfclient doc pkgsrc redhat tests isisd vtysh ospfclient doc pkgsrc redhat tests

15
configure.ac
View file

@ -5,7 +5,7 @@
## Copyright (c) 1996, 97, 98, 99, 2000 Kunihiro Ishiguro <kunihiro@zebra.org> ## Copyright (c) 1996, 97, 98, 99, 2000 Kunihiro Ishiguro <kunihiro@zebra.org>
## Portions Copyright (c) 2003 Paul Jakma <paul@dishone.st> ## Portions Copyright (c) 2003 Paul Jakma <paul@dishone.st>
## ##
## $Id: configure.ac,v 1.61 2004/08/27 15:57:35 gdt Exp $ ## $Id: configure.ac,v 1.62 2004/08/31 18:16:36 gdt Exp $
AC_PREREQ(2.53) AC_PREREQ(2.53)
AC_INIT(quagga, 0.96.5, [http://bugzilla.quagga.net]) AC_INIT(quagga, 0.96.5, [http://bugzilla.quagga.net])
@ -22,6 +22,17 @@ AC_ARG_ENABLE([exampledir],
dnl XXX add --exampledir to autoconf standard directory list somehow dnl XXX add --exampledir to autoconf standard directory list somehow
AC_SUBST(exampledir) AC_SUBST(exampledir)
dnl default is to match previous behavior
pkgsrcrcdir=""
pkgsrcdir=""
AC_ARG_ENABLE([pkgsrcrcdir],
AC_HELP_STRING([--enable-pkgsrcrcdir],
[specify directory for rc.d scripts]),
pkgsrcrcdir="$enableval"; pkgsrcdir="pkgsrc",)
dnl XXX add --pkgsrcrcdir to autoconf standard directory list somehow
AC_SUBST(pkgsrcdir)
AC_SUBST(pkgsrcrcdir)
dnl ----------------------------------- dnl -----------------------------------
dnl Get hostname and other information. dnl Get hostname and other information.
dnl ----------------------------------- dnl -----------------------------------
@ -1127,6 +1138,8 @@ AC_OUTPUT(Makefile lib/Makefile zebra/Makefile ripd/Makefile
redhat/Makefile redhat/quagga.spec redhat/Makefile redhat/quagga.spec
lib/version.h lib/version.h
tests/Makefile tests/Makefile
pkgsrc/bgpd.sh pkgsrc/ospf6d.sh pkgsrc/ospfd.sh
pkgsrc/ripd.sh pkgsrc/ripngd.sh pkgsrc/zebra.sh
, ,
[chmod +x vtysh/extract.pl]) [chmod +x vtysh/extract.pl])

15
pkgsrc/ChangeLog Normal file
View file

@ -0,0 +1,15 @@
2004-08-31 Greg Troxel <gdt@poblano.ir.bbn.com>
* Rename scripts to *.sh.in, and use autoconf-style substitution
for prefix and localstatedir.
2004-08-31 Greg Troxel <gdt@poblano.ir.bbn.com>
* Makefile.am: Only put pkgsrc dir in SUBDIRS if we should install
rc.d files. (Note that pkgsrc is always in DIST_SUBDIRS.)
* configure.ac (pkgsrcdir): add new --enable-pkgsrcrcdir to give a
directory into which www.pkgsrc.org-style rc.d files are
installed.

4
pkgsrc/Makefile.am
View file

@ -1 +1,3 @@
EXTRA_DIST = bgpd.sh ospf6d.sh ospfd.sh ripd.sh ripngd.sh zebra.sh rcdir=@pkgsrcrcdir@
rc_SCRIPTS = bgpd.sh ospf6d.sh ospfd.sh ripd.sh ripngd.sh zebra.sh

8
pkgsrc/bgpd.sh → pkgsrc/bgpd.sh.in
View file

@ -6,7 +6,7 @@
# REQUIRE: zebra # REQUIRE: zebra
## ##
PATH=/sbin:/bin:/usr/sbin:/usr/bin:@PREFIX@/sbin:@PREFIX@/bin PATH=/sbin:/bin:/usr/sbin:/usr/bin:@prefix@/sbin:@prefix@/bin
export PATH export PATH
if [ -f /etc/rc.subr ] if [ -f /etc/rc.subr ]
@ -16,12 +16,12 @@ fi
name="bgpd" name="bgpd"
rcvar=$name rcvar=$name
required_files="@PKG_SYSCONFDIR@/${name}.conf" required_files="@sysconfdir@/${name}.conf"
command="@PREFIX@/sbin/${name}" command="@prefix@/sbin/${name}"
command_args="-d" command_args="-d"
start_precmd="zebra_precmd" start_precmd="zebra_precmd"
socket_dir=/var/run/zebra socket_dir=@localstatedir@
pidfile="${socket_dir}/${name}.pid" pidfile="${socket_dir}/${name}.pid"
zebra_precmd() zebra_precmd()

8
pkgsrc/ospf6d.sh → pkgsrc/ospf6d.sh.in
View file

@ -6,7 +6,7 @@
# REQUIRE: zebra # REQUIRE: zebra
## ##
PATH=/sbin:/bin:/usr/sbin:/usr/bin:@PREFIX@/sbin:@PREFIX@/bin PATH=/sbin:/bin:/usr/sbin:/usr/bin:@prefix@/sbin:@prefix@/bin
export PATH export PATH
if [ -f /etc/rc.subr ] if [ -f /etc/rc.subr ]
@ -16,12 +16,12 @@ fi
name="ospf6d" name="ospf6d"
rcvar=$name rcvar=$name
required_files="@PKG_SYSCONFDIR@/${name}.conf" required_files="@sysconfdir@/${name}.conf"
command="@PREFIX@/sbin/${name}" command="@prefix@/sbin/${name}"
command_args="-d" command_args="-d"
start_precmd="zebra_precmd" start_precmd="zebra_precmd"
socket_dir=/var/run/zebra socket_dir=@localstatedir@
pidfile="${socket_dir}/${name}.pid" pidfile="${socket_dir}/${name}.pid"
zebra_precmd() zebra_precmd()

8
pkgsrc/ospfd.sh → pkgsrc/ospfd.sh.in
View file

@ -6,7 +6,7 @@
# REQUIRE: zebra # REQUIRE: zebra
## ##
PATH=/sbin:/bin:/usr/sbin:/usr/bin:@PREFIX@/sbin:@PREFIX@/bin PATH=/sbin:/bin:/usr/sbin:/usr/bin:@prefix@/sbin:@prefix@/bin
export PATH export PATH
if [ -f /etc/rc.subr ] if [ -f /etc/rc.subr ]
@ -16,12 +16,12 @@ fi
name="ospfd" name="ospfd"
rcvar=$name rcvar=$name
required_files="@PKG_SYSCONFDIR@/${name}.conf" required_files="@sysconfdir@/${name}.conf"
command="@PREFIX@/sbin/${name}" command="@prefix@/sbin/${name}"
command_args="-d" command_args="-d"
start_precmd="zebra_precmd" start_precmd="zebra_precmd"
socket_dir=/var/run/zebra socket_dir=@localstatedir@
pidfile="${socket_dir}/${name}.pid" pidfile="${socket_dir}/${name}.pid"
zebra_precmd() zebra_precmd()

8
pkgsrc/ripd.sh → pkgsrc/ripd.sh.in
View file

@ -6,7 +6,7 @@
# REQUIRE: zebra # REQUIRE: zebra
## ##
PATH=/sbin:/bin:/usr/sbin:/usr/bin:@PREFIX@/sbin:@PREFIX@/bin PATH=/sbin:/bin:/usr/sbin:/usr/bin:@prefix@/sbin:@prefix@/bin
export PATH export PATH
if [ -f /etc/rc.subr ] if [ -f /etc/rc.subr ]
@ -16,12 +16,12 @@ fi
name="ripd" name="ripd"
rcvar=$name rcvar=$name
required_files="@PKG_SYSCONFDIR@/${name}.conf" required_files="@sysconfdir@/${name}.conf"
command="@PREFIX@/sbin/${name}" command="@prefix@/sbin/${name}"
command_args="-d" command_args="-d"
start_precmd="zebra_precmd" start_precmd="zebra_precmd"
socket_dir=/var/run/zebra socket_dir=@localstatedir@
pidfile="${socket_dir}/${name}.pid" pidfile="${socket_dir}/${name}.pid"
zebra_precmd() zebra_precmd()

8
pkgsrc/ripngd.sh → pkgsrc/ripngd.sh.in
View file

@ -6,7 +6,7 @@
# REQUIRE: zebra # REQUIRE: zebra
## ##
PATH=/sbin:/bin:/usr/sbin:/usr/bin:@PREFIX@/sbin:@PREFIX@/bin PATH=/sbin:/bin:/usr/sbin:/usr/bin:@prefix@/sbin:@prefix@/bin
export PATH export PATH
if [ -f /etc/rc.subr ] if [ -f /etc/rc.subr ]
@ -16,12 +16,12 @@ fi
name="ripngd" name="ripngd"
rcvar=$name rcvar=$name
required_files="@PKG_SYSCONFDIR@/${name}.conf" required_files="@sysconfdir@/${name}.conf"
command="@PREFIX@/sbin/${name}" command="@prefix@/sbin/${name}"
command_args="-d" command_args="-d"
start_precmd="zebra_precmd" start_precmd="zebra_precmd"
socket_dir=/var/run/zebra socket_dir=@localstatedir@
pidfile="${socket_dir}/${name}.pid" pidfile="${socket_dir}/${name}.pid"
zebra_precmd() zebra_precmd()

8
pkgsrc/zebra.sh → pkgsrc/zebra.sh.in
View file

@ -6,7 +6,7 @@
# REQUIRE: NETWORKING # REQUIRE: NETWORKING
## ##
PATH=/sbin:/bin:/usr/sbin:/usr/bin:@PREFIX@/sbin:@PREFIX@/bin PATH=/sbin:/bin:/usr/sbin:/usr/bin:@prefix@/sbin:@prefix@/bin
export PATH export PATH
if [ -f /etc/rc.subr ] if [ -f /etc/rc.subr ]
@ -16,13 +16,13 @@ fi
name="zebra" name="zebra"
rcvar=$name rcvar=$name
required_files="@PKG_SYSCONFDIR@/${name}.conf" required_files="@sysconfdir@/${name}.conf"
command="@PREFIX@/sbin/${name}" command="@prefix@/sbin/${name}"
command_args="-d" command_args="-d"
start_precmd="zebra_precmd" start_precmd="zebra_precmd"
stop_postcmd="zebra_postcmd" stop_postcmd="zebra_postcmd"
socket_dir=/var/run/zebra socket_dir=@localstatedir@
pidfile="${socket_dir}/${name}.pid" pidfile="${socket_dir}/${name}.pid"
zebra_precmd() zebra_precmd()