* nero/doc :
- Prise en compte de DESTDIR dans les Makefile.am generes par builddoc.sh.
This commit is contained in:
parent
0c739f9b41
commit
181d312d2f
|
@ -1,16 +1,16 @@
|
|||
dnl Process this file with autoconf to produce a configure script.
|
||||
AC_INIT(src/nero.cpp)
|
||||
|
||||
POIRE_MAJOR_VERSION=1
|
||||
POIRE_MINOR_VERSION=0
|
||||
POIRE_VERSION=$POIRE_MAJOR_VERSION.$POIRE_MINOR_VERSION
|
||||
NERO_MAJOR_VERSION=1
|
||||
NERO_MINOR_VERSION=0
|
||||
NERO_VERSION=$POIRE_MAJOR_VERSION.$POIRE_MINOR_VERSION
|
||||
|
||||
AC_SUBST(POIRE_MAJOR_VERSION)
|
||||
AC_SUBST(POIRE_MINOR_VERSION)
|
||||
AC_SUBST(POIRE_VERSION)
|
||||
AC_SUBST(NERO_MAJOR_VERSION)
|
||||
AC_SUBST(NERO_MINOR_VERSION)
|
||||
AC_SUBST(NERO_VERSION)
|
||||
|
||||
# For automake.
|
||||
VERSION=$POIRE_VERSION
|
||||
VERSION=$NERO_VERSION
|
||||
PACKAGE=nero
|
||||
|
||||
dnl Initialize automake stuff
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
|
||||
SUBDIRS = nero man1
|
||||
SUBDIRS = nero
|
||||
|
||||
pdfdir = $(prefix)/doc/pdf
|
||||
pdfdir = $(DESTDIR)$(prefix)/doc/pdf
|
||||
pdf_DATA = nero.pdf
|
||||
|
||||
EXTRA_DIST = $(pdf_DATA) \
|
||||
|
|
|
@ -75,7 +75,7 @@
|
|||
DOC_AM="Makefile.am-doc"
|
||||
echo "" > $DOC_AM
|
||||
echo "" >> $DOC_AM
|
||||
echo "pkghtmldir = \$(prefix)/doc/html/@PACKAGE@" >> $DOC_AM
|
||||
echo "pkghtmldir = \$(DESTDIR)\$(prefix)/doc/html/@PACKAGE@" >> $DOC_AM
|
||||
echo "pkghtml_DATA = \\" >> $DOC_AM
|
||||
FILE_LIST=`(cd $TOOL; find . -name \*.html -exec echo {} \;)`
|
||||
set $FILE_LIST
|
||||
|
@ -89,7 +89,7 @@
|
|||
echo "EXTRA_DIST = \$(pkghtml_DATA)" >> $DOC_AM
|
||||
echo "" >> $DOC_AM
|
||||
echo "install-data-hook:" >> $DOC_AM
|
||||
echo " chmod -R g+w \$(prefix)/doc/html/@PACKAGE@" >> $DOC_AM
|
||||
echo " chmod -R g+w \$(DESTDIR)\$(prefix)/doc/html/@PACKAGE@" >> $DOC_AM
|
||||
|
||||
|
||||
mv $DOC_AM $TOOL/Makefile.am
|
||||
|
@ -109,7 +109,7 @@
|
|||
echo "" > $DOC_AM
|
||||
echo "SUBDIRS = $TOOL" >> $DOC_AM
|
||||
echo "" >> $DOC_AM
|
||||
echo "pdfdir = \$(prefix)/doc/pdf" >> $DOC_AM
|
||||
echo "pdfdir = \$(DESTDIR)\$(prefix)/doc/pdf" >> $DOC_AM
|
||||
echo "pdf_DATA = $TOOL.pdf" >> $DOC_AM
|
||||
echo "" >> $DOC_AM
|
||||
echo "EXTRA_DIST = \$(pdf_DATA) \\" >> $DOC_AM
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
|
||||
|
||||
man_MANS = nero.1
|
||||
man_MANS = \
|
||||
./nero.1
|
||||
|
||||
EXTRA_DIST = $(man_MANS)
|
||||
|
|
|
@ -1,11 +1,13 @@
|
|||
.\\" auto-generated by docbook2man-spec $Revision: 1.1 $
|
||||
.TH "NERO" "1" "02 October 2002" "ASIM/LIP6" "Alliance - nero User's Manual"
|
||||
.\\" auto-generated by docbook2man-spec $Revision: 1.2 $
|
||||
.TH "NERO" "1" "09 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
|
||||
|
|
Binary file not shown.
|
@ -1,6 +1,6 @@
|
|||
|
||||
|
||||
pkghtmldir = $(prefix)/doc/html/@PACKAGE@
|
||||
pkghtmldir = $(DESTDIR)$(prefix)/doc/html/@PACKAGE@
|
||||
pkghtml_DATA = \
|
||||
./nero.html \
|
||||
./ref_nero.html \
|
||||
|
@ -9,4 +9,4 @@ pkghtml_DATA = \
|
|||
EXTRA_DIST = $(pkghtml_DATA)
|
||||
|
||||
install-data-hook:
|
||||
chmod -R g+w $(prefix)/doc/html/@PACKAGE@
|
||||
chmod -R g+w $(DESTDIR)$(prefix)/doc/html/@PACKAGE@
|
||||
|
|
|
@ -10,8 +10,8 @@ AM_CFLAGS = @ALLIANCE_CFLAGS@
|
|||
bin_PROGRAMS = nero pdv
|
||||
#noinst_PROGRAMS = debug
|
||||
|
||||
nero_LDADD = @ALLIANCE_LIBS@ \
|
||||
$(top_builddir)/src/libU.a \
|
||||
nero_LDADD = -L$(libdir) @ALLIANCE_LIBS@ \
|
||||
$(top_builddir)/src/libU.a \
|
||||
-lMpu -lMlu \
|
||||
-lMcl -lMcp \
|
||||
-lMal -lMap \
|
||||
|
|
Loading…
Reference in New Issue