From b7a56aacda9096db9b22760cea1e137e1107d3d9 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Sun, 13 Oct 2002 17:33:28 +0000 Subject: [PATCH] * nero/builddoc.sh : - Bug : dans les Makefile.am, seule l'install-hook doit utiliser DESTDIR. --- alliance/src/nero/doc/Makefile.am | 2 +- alliance/src/nero/doc/builddoc.sh | 4 ++-- alliance/src/nero/doc/man1/nero.1 | 6 ++---- alliance/src/nero/doc/nero.pdf | Bin 121467 -> 121467 bytes alliance/src/nero/doc/nero/Makefile.am | 2 +- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/alliance/src/nero/doc/Makefile.am b/alliance/src/nero/doc/Makefile.am index 6552189d..4f86cb27 100644 --- a/alliance/src/nero/doc/Makefile.am +++ b/alliance/src/nero/doc/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS = nero -pdfdir = $(DESTDIR)$(prefix)/doc/pdf +pdfdir = $(prefix)/doc/pdf pdf_DATA = nero.pdf EXTRA_DIST = $(pdf_DATA) \ diff --git a/alliance/src/nero/doc/builddoc.sh b/alliance/src/nero/doc/builddoc.sh index 4cfe14f4..ae910ef0 100755 --- a/alliance/src/nero/doc/builddoc.sh +++ b/alliance/src/nero/doc/builddoc.sh @@ -75,7 +75,7 @@ DOC_AM="Makefile.am-doc" echo "" > $DOC_AM echo "" >> $DOC_AM - echo "pkghtmldir = \$(DESTDIR)\$(prefix)/doc/html/@PACKAGE@" >> $DOC_AM + echo "pkghtmldir = \$(prefix)/doc/html/@PACKAGE@" >> $DOC_AM echo "pkghtml_DATA = \\" >> $DOC_AM FILE_LIST=`(cd $TOOL; find . -name \*.html -exec echo {} \;)` set $FILE_LIST @@ -109,7 +109,7 @@ echo "" > $DOC_AM echo "SUBDIRS = $TOOL" >> $DOC_AM echo "" >> $DOC_AM - echo "pdfdir = \$(DESTDIR)\$(prefix)/doc/pdf" >> $DOC_AM + echo "pdfdir = \$(prefix)/doc/pdf" >> $DOC_AM echo "pdf_DATA = $TOOL.pdf" >> $DOC_AM echo "" >> $DOC_AM echo "EXTRA_DIST = \$(pdf_DATA) \\" >> $DOC_AM diff --git a/alliance/src/nero/doc/man1/nero.1 b/alliance/src/nero/doc/man1/nero.1 index 5b07fbb6..e3aa45ef 100644 --- a/alliance/src/nero/doc/man1/nero.1 +++ b/alliance/src/nero/doc/man1/nero.1 @@ -1,13 +1,11 @@ -.\\" auto-generated by docbook2man-spec $Revision: 1.2 $ -.TH "NERO" "1" "09 October 2002" "ASIM/LIP6" "Alliance - nero User's Manual" +.\\" auto-generated by docbook2man-spec $Revision: 1.3 $ +.TH "NERO" "1" "13 October 2002" "ASIM/LIP6" "Alliance - nero User's Manual" .SH NAME nero \- Negotiating Router .SH SYNOPSIS .sp \fBnero\fR [ \fB-h\fR ] [ \fB-v\fR ] [ \fB-V\fR ] [ \fB-c\fR ] [ \fB-2\fR ] [ \fB-3\fR ] [ \fB-4\fR ] [ \fB-5\fR ] [ \fB-6\fR ] [ \fB-L\fR ] [ \fB-G\fR ] - [ \fB--help\fR ] [ \fB--verbose\fR ] [ \fB--very-verbose\fR ] [ \fB--core-dump\fR ] [ \fB--local\fR ] [ \fB--global\fR ] - [ \fB--place \fIplacement\fB\fR ] \fB\fInetlist\fB\fR \fB\fIlayout\fB\fR .SH "DESCRIPTION" .PP diff --git a/alliance/src/nero/doc/nero.pdf b/alliance/src/nero/doc/nero.pdf index 511cd4d8bf1ea1b2fb6f485d48554ec4a61635c6..63b243be5b401290bd0e79f63140d16bab935046 100644 GIT binary patch delta 24 gcmeyph5h#y_J%Ettw-4mjSVf0EVp+bW&9ul0E-9;Hvj+t delta 24 gcmeyph5h#y_J%Ettw-4mER76}%(r(RW&9ul0E+SoGXMYp diff --git a/alliance/src/nero/doc/nero/Makefile.am b/alliance/src/nero/doc/nero/Makefile.am index 5cba69a8..0b79e385 100644 --- a/alliance/src/nero/doc/nero/Makefile.am +++ b/alliance/src/nero/doc/nero/Makefile.am @@ -1,6 +1,6 @@ -pkghtmldir = $(DESTDIR)$(prefix)/doc/html/@PACKAGE@ +pkghtmldir = $(prefix)/doc/html/@PACKAGE@ pkghtml_DATA = \ ./nero.html \ ./ref_nero.html \