summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpaul <paul>2004-09-13 13:15:25 +0000
committerpaul <paul>2004-09-13 13:15:25 +0000
commitb5f310cb9f78b140f1c747148cad6889133597fc (patch)
tree19a9177f8d8488fe853bf142fe34bbb6a12290a6
parentb63dc1f30ee935184918becd4dbfd535c632c620 (diff)
2004-09-11 Paul Jakma <paul@dishone.st>
* doc/quagga.texi: Update copyright. Contents should be at beginning of docs... * redhat/quagga.spec.in: wee keep_build define, to keep build dir.
-rw-r--r--doc/ChangeLog5
-rw-r--r--doc/quagga.texi8
-rw-r--r--redhat/quagga.spec.in7
3 files changed, 15 insertions, 5 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 243ff96c..bb2e4771 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,10 @@
2004-09-11 Paul Jakma <paul@dishone.st>
+ * quagga.texi: Update copyright. Contents should be at beginning
+ of docs...
+
+2004-09-11 Paul Jakma <paul@dishone.st>
+
* ospfd.texi: OSPF MD5 auth requires stable time.
2004-08-31 Hasso Tepper <hasso at quagga.net>
diff --git a/doc/quagga.texi b/doc/quagga.texi
index cb192a60..487ac942 100644
--- a/doc/quagga.texi
+++ b/doc/quagga.texi
@@ -32,7 +32,7 @@ TCP/IP routing protocols.
This is Edition @value{EDITION}, last updated @value{UPDATED} of
@cite{The Quagga Manual}, for Quagga Version @value{VERSION}.
-Copyright (C) 1999, 2000, 2001, 2002 Kunihiro Ishiguro
+Copyright (C) 1999-2004 Kunihiro Ishiguro, et al.
Permission is granted to make and distribute verbatim copies of this
manual provided the copyright notice and this permission notice are
@@ -65,7 +65,7 @@ approved by Kunihiro Ishiguro.
@page
@vskip 0pt plus 1filll
-Copyright @copyright{} 1999, 2000, 2001, 2002 Kunihiro Ishiguro
+Copyright @copyright{} 1999-2004 Kunihiro Ishiguro, et al.
Permission is granted to make and distribute verbatim copies of
this manual provided the copyright notice and this permission notice
@@ -114,6 +114,8 @@ quagga-@value{VERSION}. Quagga is a fork of GNU Zebra.
* Command Index::
* VTY Key Index::
@end menu
+@summarycontents
+@contents
@include overview.texi
@include install.texi
@@ -145,6 +147,4 @@ quagga-@value{VERSION}. Quagga is a fork of GNU Zebra.
@printindex ky
-@summarycontents
-@contents
@bye
diff --git a/redhat/quagga.spec.in b/redhat/quagga.spec.in
index fcfc7589..738464f8 100644
--- a/redhat/quagga.spec.in
+++ b/redhat/quagga.spec.in
@@ -36,6 +36,9 @@
%define daemon_list zebra ripd isisd ospfd bgpd
%endif
+# allow build dir to be kept
+%define keep_build 0
+
Summary: Routing daemon
Name: quagga
Version: @VERSION@
@@ -250,7 +253,9 @@ if [ "$1" = "0" ]; then
fi
%clean
-#rm -rf $RPM_BUILD_ROOT
+%if !%{keep_build}
+rm -rf $RPM_BUILD_ROOT
+%endif
%files
%defattr(-,root,root)