* attila/doc/builddoc.sh :

- Bug : dans les Makefile.am, seule l'install-hook doit utiliser DESTDIR.
2002-10-13 17:35:57 +00:00 · 2002-10-13 17:35:57 +00:00 · 251004813f
parent b7a56aacda
commit 251004813f
7 changed files with 182 additions and 48 deletions
--- a/alliance/src/attila/doc/Makefile.am
+++ b/alliance/src/attila/doc/Makefile.am
@ -1,7 +1,7 @@

 SUBDIRS = attila

-pdfdir = $(DESTDIR)$(prefix)/doc/pdf
+pdfdir = $(prefix)/doc/pdf
 pdf_DATA = attila.pdf

 EXTRA_DIST = $(pdf_DATA) \
--- a/alliance/src/attila/doc/attila.pdf
+++ b/alliance/src/attila/doc/attila.pdf
--- a/alliance/src/attila/doc/attila/Makefile.am
+++ b/alliance/src/attila/doc/attila/Makefile.am
@ -1,6 +1,6 @@


-pkghtmldir = $(DESTDIR)$(prefix)/doc/html/@PACKAGE@
+pkghtmldir = $(prefix)/doc/html/@PACKAGE@
 pkghtml_DATA = \
               ./attila.html \
               ./ref_attila.html \
--- a/alliance/src/attila/doc/attila/man_attila.html
+++ b/alliance/src/attila/doc/attila/man_attila.html
@ -102,17 +102,32 @@ CLASS="REPLACEABLE"
 ><I
 >name2</I
 ></TT
->...]<BR> {--rule=<TT
+>...]<BR> [-c- {<TT
 CLASS="REPLACEABLE"
 ><I
->rulename</I
+>configure_arg1</I
 ></TT
->}</P
+> }  [ <TT
+CLASS="REPLACEABLE"
+><I
+>configure_arg2</I
+></TT
+> ...] ]<BR> [-m- {<TT
+CLASS="REPLACEABLE"
+><I
+>make_arg1</I
+></TT
+>}  [<TT
+CLASS="REPLACEABLE"
+><I
+>make_arg2</I
+></TT
+>...] ]</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN53"
+NAME="AEN62"
 ></A
 ><H2
 > Description </H2
@ -280,7 +295,7 @@ VALIGN="TOP"
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN91"
+NAME="AEN100"
 ></A
 ><H3
 > Directory Structure </H3
@ -362,7 +377,7 @@ CLASS="LITERAL"
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN115"
+NAME="AEN124"
 ></A
 ><H3
 > CVS checkout </H3
@ -426,7 +441,7 @@ CLASS="LITERAL"
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN136"
+NAME="AEN145"
 ></A
 ><H3
 > Guessing <TT
@ -473,7 +488,7 @@ CLASS="LITERAL"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN149"
+NAME="AEN158"
 ></A
 ><H2
 > Guessing <TT
@ -574,7 +589,7 @@ CLASS="LITERAL"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN170"
+NAME="AEN179"
 ></A
 ><H2
 > Arguments </H2
@ -736,29 +751,84 @@ CLASS="FILENAME"
 > <TT
 CLASS="USERINPUT"
 ><B
->--rule=<TT
+>-c- <TT
 CLASS="FILENAME"
->rulename</TT
+>configure_arg1</TT
 ></B
 ></TT
 > :
-        name of the rule to be passed to the <TT
+        all arguments following <TT
+CLASS="USERINPUT"
+><B
+>-c-</B
+></TT
+> (until a
+        <TT
+CLASS="USERINPUT"
+><B
+>-m-</B
+></TT
+> is encountered) are passed
+        <I
+CLASS="EMPHASIS"
+>as is</I
+> to the subsequent call to
+        <TT
+CLASS="LITERAL"
+>configure</TT
+>. For example, if you want to first
+        use your local libraries, give <TT
+CLASS="USERINPUT"
+><B
+>--enable-devel</B
+></TT
+>.
+        </P
+></LI
+><LI
+><P
+> <TT
+CLASS="USERINPUT"
+><B
+>-m- <TT
+CLASS="FILENAME"
+>make_arg1</TT
+></B
+></TT
+> :
+        all arguments following <TT
+CLASS="USERINPUT"
+><B
+>-m-</B
+></TT
+> are passed
+        <I
+CLASS="EMPHASIS"
+>as is</I
+> to the subsequent call to
+        <TT
 CLASS="LITERAL"
 >make</TT
-> command.
-        By default : <TT
+>. If no <TT
+CLASS="USERINPUT"
+><B
+>-m-</B
+></TT
+>
+        argument is given, then <TT
 CLASS="USERINPUT"
 ><B
 >install</B
 ></TT
->. In the unlikely
-        case you wants to remove a tool, you can pass
+> is
+        assumed. If you want to completly uninstall a tool and clean
+        it's build directory you can pass
        <TT
 CLASS="USERINPUT"
 ><B
->uninstall</B
+>uninstall clean</B
 ></TT
->.
+>
        </P
 ></LI
 ></UL
@ -768,7 +838,7 @@ CLASS="USERINPUT"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN219"
+NAME="AEN240"
 ></A
 ><H2
 > Configuration file <TT
@ -931,7 +1001,7 @@ CLASS="LITERAL"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN264"
+NAME="AEN285"
 ></A
 ><H2
 > Examples </H2
@ -1017,7 +1087,7 @@ CLASS="USERINPUT"
 >    Compile &#38; install <TT
 CLASS="LITERAL"
 >mbk</TT
-> the <TT
+> then <TT
 CLASS="LITERAL"
 >genlib</TT
 >
@ -1044,6 +1114,32 @@ CLASS="USERINPUT"
 >
    </P
 ><P
+>    Compile <TT
+CLASS="LITERAL"
+>nero</TT
+> tool and link it against the locally
+    installed libraries (if any).
+    <TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="SCREEN"
+>$ <TT
+CLASS="USERINPUT"
+><B
+>attila --tool=nero -c- --enable-devel</B
+></TT
+>
+    </PRE
+></TD
+></TR
+></TABLE
+>
+    </P
+><P
 >    Remove <TT
 CLASS="LITERAL"
 >poire</TT
@ -1066,7 +1162,7 @@ CLASS="SCREEN"
 >$ <TT
 CLASS="USERINPUT"
 ><B
->attila --asim --tool=poire --rule=uninstall</B
+>attila --asim --tool=poire -m- uninstall</B
 ></TT
 >
    </PRE
--- a/alliance/src/attila/doc/builddoc.sh
+++ b/alliance/src/attila/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
--- a/alliance/src/attila/doc/man1/attila.1
+++ b/alliance/src/attila/doc/man1/attila.1
@ -1,18 +1,15 @@
-.\\" auto-generated by docbook2man-spec $Revision: 1.4 $
-.TH "ATTILA" "1" "09 October 2002" "ASIM/LIP6" "Alliance - attila User's Manual"
+.\\" auto-generated by docbook2man-spec $Revision: 1.6 $
+.TH "ATTILA" "1" "13 October 2002" "ASIM/LIP6" "Alliance - attila User's Manual"
 .SH NAME
 attila \- A Tool Installer
 .SH SYNOPSIS
 .sp
 \fBattila\fR [ \fB-h\fR ]  [ \fB-S\fR ]  [ \fB-U\fR ]  [ \fB-F\fR ]  [ \fB-A\fR ] 
-
 [ \fB--help\fR ]  [ \fB--ssh\fR ]  [ \fB--user\fR ]  [ \fB--asim\fR ] 
-
 [ \fB--prefix=\fIINSTALL_DIR\fB\fR ]  [ \fB--builddir=\fIBUILD_DIR\fB\fR ] 
-
 \fB--tool=\fIname1\fB\fR [ \fB--tool=\fIname2\fB\fR\fI...\fR ] 
-
- \fB--rule=\fIrulename\fB\fR
+ [ \fB-c- \fIconfigure_arg1\fB   [  \fIconfigure_arg2\fB \fI...\fB ]  \fR ] 
+ [ \fB-m- \fImake_arg1\fB  [ \fImake_arg2\fB\fI...\fB ]  \fR ] 
 .SH "DESCRIPTION"
 .PP
 attila automates the process of compiling
@ -185,11 +182,22 @@ override the default building directory.
 name of the tool to be installed.
 .TP 0.2i
 \(bu
-\fB--rule=\fIrulename\fB\fR\ :
-name of the rule to be passed to the make command.
-By default\ : \fBinstall\fR. In the unlikely
-case you wants to remove a tool, you can pass
-\fBuninstall\fR.
+\fB-c- \fIconfigure_arg1\fB\fR\ :
+all arguments following \fB-c-\fR (until a
+\fB-m-\fR is encountered) are passed
+\fBas is\fR to the subsequent call to
+configure. For example, if you want to first
+use your local libraries, give \fB--enable-devel\fR.
+.TP 0.2i
+\(bu
+\fB-m- \fImake_arg1\fB\fR\ :
+all arguments following \fB-m-\fR are passed
+\fBas is\fR to the subsequent call to
+make. If no \fB-m-\fR
+argument is given, then \fBinstall\fR is
+assumed. If you want to completly uninstall a tool and clean
+it's build directory you can pass
+\fBuninstall clean\fR
 .PP
 .SH "CONFIGURATION FILE ATTILA.CONF"
 .PP
@ -264,13 +272,22 @@ $ \fBattila --asim --tool=nero\fR
 .sp
 .fi
 .PP
-Compile & install mbk the genlib
+Compile & install mbk then genlib
 (the order is significant) in a row for a local install on the current
 computer\ :
 .sp
 .nf
 $ \fBattila --tool=mbk --tool=genlib\fR
    
+.sp
+.fi
+.PP
+Compile nero tool and link it against the locally
+installed libraries (if any).
+.sp
+.nf
+$ \fBattila --tool=nero -c- --enable-devel\fR
+    
 .sp
 .fi
 .PP
@ -278,7 +295,7 @@ Remove poire tool from the system-wide tree.
 (poire is the old name of nero).
 .sp
 .nf
-$ \fBattila --asim --tool=poire --rule=uninstall\fR
+$ \fBattila --asim --tool=poire -m- uninstall\fR
    
 .sp
 .fi
--- a/alliance/src/attila/doc/man_attila.sgm
+++ b/alliance/src/attila/doc/man_attila.sgm
@ -35,7 +35,9 @@
        <arg choice="req">--tool=<replaceable>name1</replaceable></arg>
        <arg rep="repeat">--tool=<replaceable>name2</replaceable></arg>
        <sbr>
-        <arg choice="req">--rule=<replaceable>rulename</replaceable></arg>
+        <arg>-c-<arg choice="req"><replaceable>configure_arg1</replaceable> </arg> <arg rep="repeat"> <replaceable>configure_arg2</replaceable> </arg> </arg>
+        <sbr>
+        <arg>-m-<arg choice="req"><replaceable>make_arg1</replaceable></arg> <arg rep="repeat"><replaceable>make_arg2</replaceable></arg> </arg>
    </cmdsynopsis>
  </refsynopsisdiv>

@ -269,11 +271,23 @@
        </para>
      </listitem>
      <listitem>
-        <para> <userinput>--rule=<filename>rulename</filename></userinput>&nbsp;:
-        name of the rule to be passed to the <literal>make</literal> command.
-        By default&nbsp;: <userinput>install</userinput>. In the unlikely
-        case you wants to remove a tool, you can pass
-        <userinput>uninstall</userinput>.
+        <para> <userinput>-c- <filename>configure_arg1</filename></userinput>&nbsp;:
+        all arguments following <userinput>-c-</userinput> (until a
+        <userinput>-m-</userinput> is encountered) are passed
+        <emphasis>as is</emphasis> to the subsequent call to
+        <literal>configure</literal>. For example, if you want to first
+        use your local libraries, give <userinput>--enable-devel</userinput>.
+        </para>
+      </listitem>
+      <listitem>
+        <para> <userinput>-m- <filename>make_arg1</filename></userinput>&nbsp;:
+        all arguments following <userinput>-m-</userinput> are passed
+        <emphasis>as is</emphasis> to the subsequent call to
+        <literal>make</literal>. If no <userinput>-m-</userinput>
+        argument is given, then <userinput>install</userinput> is
+        assumed. If you want to completly uninstall a tool and clean
+        it's build directory you can pass
+        <userinput>uninstall clean</userinput>
        </para>
      </listitem>
    </itemizedlist>
@ -365,18 +379,25 @@ $ <userinput>attila --asim --tool=nero</userinput>
    </screen>
    </para>
    <para>
-    Compile & install <literal>mbk</literal> the <literal>genlib</literal>
+    Compile & install <literal>mbk</literal> then <literal>genlib</literal>
    (the order is significant) in a row for a local install on the current
    computer&nbsp;:
    <screen>
 $ <userinput>attila --tool=mbk --tool=genlib</userinput>
+    </screen>
+    </para>
+    <para>
+    Compile <literal>nero</literal> tool and link it against the locally
+    installed libraries (if any).
+    <screen>
+$ <userinput>attila --tool=nero -c- --enable-devel</userinput>
    </screen>
    </para>
    <para>
    Remove <literal>poire</literal> tool from the system-wide tree.
    (<literal>poire</literal> is the old name of <literal>nero</literal>).
    <screen>
-$ <userinput>attila --asim --tool=poire --rule=uninstall</userinput>
+$ <userinput>attila --asim --tool=poire -m- uninstall</userinput>
    </screen>
    </para>