From: Simon Wilkinson Date: Wed, 22 Jul 2009 00:11:15 +0000 (+0100) Subject: Rename installed version of compile_et X-Git-Tag: openafs-stable-1_4_12pre1~14 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=559718974e75d1348b9e18456dfa6fd099ad3419;p=packages%2Fo%2Fopenafs.git Rename installed version of compile_et Rename the installed version of compile_et to afs_compile_et to avoid conflicts with other, more standard, users of com_err. Also rename the man page to match Reviewed-on: http://gerrit.openafs.org/175 Tested-by: Derrick Brashear Reviewed-by: Derrick Brashear (cherry picked from c321cb467220bbdf2ff49d5fa6e052fd27a4df5e) Change-Id: I6de96fd2056a632dc8770b5da73604dd20f8c125 Reviewed-on: http://gerrit.openafs.org/992 --- diff --git a/doc/man-pages/pod1/afs_compile_et.pod b/doc/man-pages/pod1/afs_compile_et.pod new file mode 100644 index 000000000..4f15a659c --- /dev/null +++ b/doc/man-pages/pod1/afs_compile_et.pod @@ -0,0 +1,83 @@ +=head1 NAME + +afs_compile_et - Produce error text tables for compilation + +=head1 SYNOPSIS + +=for html +
+ +B [B<-debug>] S<<< [B<-language> >] >>> + S<<< [B<-prefix> >] >>> [B<-v> >] > + +=for html +
+ +=head1 DESCRIPTION + +The B command builds the error text tables for compilation. +This includes both a header file that contains a set of mappings between +error names and values and a F<.c> (or F<.msf>) file that provides a text +table of descriptions. + +The > argument specifies which error table to generate. +The error table specification should exist in the current working +directory or in the directory specified with B<-prefix> and should be +named F. + +=head1 CAUTIONS + +This command is used internally within the build process for OpenAFS. +Most users will access this information via L rather than +via B. + +This command does not use the standard AFS command-line parsing package. + +=head1 OPTIONS + +=over 4 + +=item B<-debug> + +Does nothing. It neither adds debugging information to the output nor +provides additional information on its operation. + +=item B<-language> > + +Specifies the type of output to generate. Currently, only ANSI C and K&R +are supported values (via the B and B values, respectively). +The default is ANSI C. There is some support for C++ started, but that is +not yet supported. + +=item B<-prefix > + +Specifies the directory to search for the F file. + +=item B<-v> > + +Specified the type of output file: valid values are 1 (the default, for C +files) or 2, for B<.msf> file generation. + +=back + +=head1 EXAMPLES + +The following command generates the files F and F, +suitable for use with C programs: + + % afs_compile_et -p path/to/src/ptserver pterror + +The following command generates K&R style files instead: + + % afs_compile_et -p path/to/src/ptserver -lang 'k&r-c' pterror + +=head1 SEE ALSO + +L + +=head1 COPYRIGHT + +Copyright 2009 Steven Jenkins + +This documentation is covered by the IBM Public License Version 1.0. This +man page was written by Steven Jenkins for OpenAFS. diff --git a/doc/man-pages/pod1/compile_et.pod b/doc/man-pages/pod1/compile_et.pod deleted file mode 100644 index cfdb146c4..000000000 --- a/doc/man-pages/pod1/compile_et.pod +++ /dev/null @@ -1,83 +0,0 @@ -=head1 NAME - -compile_et - Produce error text tables for compilation - -=head1 SYNOPSIS - -=for html -
- -B [B<-debug>] S<<< [B<-language> >] >>> - S<<< [B<-prefix> >] >>> [B<-v> >] > - -=for html -
- -=head1 DESCRIPTION - -The B command builds the error text tables for compilation. -This includes both a header file that contains a set of mappings between -error names and values and a F<.c> (or F<.msf>) file that provides a text -table of descriptions. - -The > argument specifies which error table to generate. -The error table specification should exist in the current working -directory or in the directory specified with B<-prefix> and should be -named F. - -=head1 CAUTIONS - -This command is used internally within the build process for OpenAFS. -Most users will access this information via L rather than -via B. - -This command does not use the standard AFS command-line parsing package. - -=head1 OPTIONS - -=over 4 - -=item B<-debug> - -Does nothing. It neither adds debugging information to the output nor -provides additional information on its operation. - -=item B<-language> > - -Specifies the type of output to generate. Currently, only ANSI C and K&R -are supported values (via the B and B values, respectively). -The default is ANSI C. There is some support for C++ started, but that is -not yet supported. - -=item B<-prefix > - -Specifies the directory to search for the F file. - -=item B<-v> > - -Specified the type of output file: valid values are 1 (the default, for C -files) or 2, for B<.msf> file generation. - -=back - -=head1 EXAMPLES - -The following command generates the files F and F, -suitable for use with C programs: - - % compile_et -p path/to/src/ptserver pterror - -The following command generates K&R style files instead: - - % compile_et -p path/to/src/ptserver -lang 'k&r-c' pterror - -=head1 SEE ALSO - -L - -=head1 COPYRIGHT - -Copyright 2009 Steven Jenkins - -This documentation is covered by the IBM Public License Version 1.0. This -man page was written by Steven Jenkins for OpenAFS. diff --git a/src/comerr/Makefile.in b/src/comerr/Makefile.in index 2dba67874..4102de137 100644 --- a/src/comerr/Makefile.in +++ b/src/comerr/Makefile.in @@ -28,9 +28,9 @@ libcom_err.a: error_msg.o et_name.o com_err.o AFS_component_version_number.o # # Installation targets # -install: ${DESTDIR}${bindir}/compile_et ${DESTDIR}${includedir}/afs/com_err.h ${DESTDIR}${includedir}/afs/error_table.h ${DESTDIR}${includedir}/afs/mit-sipb-cr.h ${DESTDIR}${libdir}/afs/libcom_err.a +install: ${DESTDIR}${bindir}/afs_compile_et ${DESTDIR}${includedir}/afs/com_err.h ${DESTDIR}${includedir}/afs/error_table.h ${DESTDIR}${includedir}/afs/mit-sipb-cr.h ${DESTDIR}${libdir}/afs/libcom_err.a -${DEST}/bin/compile_et: compile_et +${DEST}/bin/afs_compile_et: compile_et ${INSTALL} $? $@ ${DEST}/include/afs/com_err.h: com_err.h @@ -59,7 +59,7 @@ compile_et.o: AFS_component_version_number.c error_table.o: et_lex.lex.c include ../config/Makefile.version -${DESTDIR}${bindir}/compile_et: compile_et +${DESTDIR}${bindir}/afs_compile_et: compile_et ${INSTALL} $? $@ ${DESTDIR}${includedir}/afs/com_err.h: com_err.h @@ -86,5 +86,5 @@ ${DESTDIR}${libdir}/afs/libcom_err.a: libcom_err.a ${TOP_LIBDIR}/libcom_err.a: libcom_err.a ${INSTALL} $? $@ -dest: ${DEST}/bin/compile_et ${DEST}/include/afs/com_err.h ${DEST}/include/afs/error_table.h ${DEST}/include/afs/mit-sipb-cr.h ${DEST}/lib/afs/libcom_err.a +dest: ${DEST}/bin/afs_compile_et ${DEST}/include/afs/com_err.h ${DEST}/include/afs/error_table.h ${DEST}/include/afs/mit-sipb-cr.h ${DEST}/lib/afs/libcom_err.a diff --git a/src/packaging/RedHat/openafs.spec.in b/src/packaging/RedHat/openafs.spec.in index 889c0b26a..45402dd54 100644 --- a/src/packaging/RedHat/openafs.spec.in +++ b/src/packaging/RedHat/openafs.spec.in @@ -1195,9 +1195,8 @@ for f in bos fs kas klog klog.krb kpwvalid pts tokens tokens.krb udebug vos ; do rm -f $RPM_BUILD_ROOT%{_prefix}/afs/bin/$f done -# compile_et is duplicated in e2fsprogs # the rest are not needed. -for f in compile_et dlog dpass install knfs livesys xstat_cm_test xstat_fs_test ; do +for f in dlog dpass install knfs livesys xstat_cm_test xstat_fs_test ; do rm -f $RPM_BUILD_ROOT%{_bindir}/$f done @@ -1569,7 +1568,7 @@ dkms remove -m %{name} -v %{dkms_version} --rpm_safe_upgrade --all ||: %{_libdir}/librxstat.a %{_libdir}/libubik.a %{_mandir}/man1/rxgen.* -%{_mandir}/man1/compile_et.* +%{_mandir}/man1/afs_compile_et.* %if %{build_dkmspkg} %files -n dkms-%{name}