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/http://gerrit.openafs.org/175
Tested-by: Derrick Brashear <shadow@dementia.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>

diff --git a/doc/man-pages/pod1/compile_et.pod b/doc/man-pages/pod1/afs_compile_et.pod
similarity index 84%
rename from doc/man-pages/pod1/compile_et.pod
rename to doc/man-pages/pod1/afs_compile_et.pod
index cfdb146..4f15a65 100644 (file)
--- a/doc/man-pages/pod1/compile_et.pod
+++ b/doc/man-pages/pod1/afs_compile_et.pod
@@ -1,13 +1,13 @@
 =head1 NAME
 
-compile_et - Produce error text tables for compilation
+afs_compile_et - Produce error text tables for compilation
 
 =head1 SYNOPSIS
 
 =for html
 <div class="synopsis">
 
-B<compile_et> [B<-debug>] S<<< [B<-language> <I<lang>>] >>>
+B<afs_compile_et> [B<-debug>] S<<< [B<-language> <I<lang>>] >>>
     S<<< [B<-prefix> <I<prefix>>] >>> [B<-v> <I<version>>] <I<error_table>>
 
 =for html
@@ -15,7 +15,7 @@ B<compile_et> [B<-debug>] S<<< [B<-language> <I<lang>>] >>>
 
 =head1 DESCRIPTION
 
-The B<compile_et> command builds the error text tables for compilation.
+The B<afs_compile_et> 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.
@@ -29,7 +29,7 @@ named F<error_table.et>.
 
 This command is used internally within the build process for OpenAFS.
 Most users will access this information via L<translate_et(1)> rather than
-via B<compile_et>.
+via B<afs_compile_et>.
 
 This command does not use the standard AFS command-line parsing package.
 
@@ -65,11 +65,11 @@ files) or 2, for B<.msf> file generation.
 The following command generates the files F<pterror.h> and F<pterror.c>, 
 suitable for use with C programs:
 
-   % compile_et -p path/to/src/ptserver pterror
+   % afs_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
+   % afs_compile_et -p path/to/src/ptserver -lang 'k&r-c' pterror
 
 =head1 SEE ALSO
 

diff --git a/src/comerr/Makefile.in b/src/comerr/Makefile.in
index 71451f0..1159918 100644 (file)
--- a/src/comerr/Makefile.in
+++ b/src/comerr/Makefile.in
@@ -49,7 +49,7 @@ install: compile_et com_err.h error_table.h mit-sipb-cr.h libcom_err.a
        ${INSTALL} -d ${DESTDIR}${bindir}
        ${INSTALL} -d ${DESTDIR}${includedir}/afs
        ${INSTALL} -d ${DESTDIR}${libdir}/afs
-       ${INSTALL_PROGRAM} compile_et ${DESTDIR}${bindir}/compile_et
+       ${INSTALL_PROGRAM} compile_et ${DESTDIR}${bindir}/afs_compile_et
        ${INSTALL_DATA} com_err.h ${DESTDIR}${includedir}/afs/com_err.h
        ${INSTALL_DATA} error_table.h ${DESTDIR}${includedir}/afs/error_table.h
        ${INSTALL_DATA} mit-sipb-cr.h ${DESTDIR}${includedir}/afs/mit-sipb-cr.h
@@ -59,7 +59,7 @@ dest: compile_et com_err.h error_table.h mit-sipb-cr.h libcom_err.a
        ${INSTALL} -d ${DEST}/bin
        ${INSTALL} -d ${DEST}/include/afs
        ${INSTALL} -d ${DEST}/lib/afs
-       ${INSTALL_PROGRAM} compile_et ${DEST}/bin/compile_et
+       ${INSTALL_PROGRAM} compile_et ${DEST}/bin/afs_compile_et
        ${INSTALL_DATA} com_err.h ${DEST}/include/afs/com_err.h
        ${INSTALL_DATA} error_table.h ${DEST}/include/afs/error_table.h
        ${INSTALL_DATA} mit-sipb-cr.h ${DEST}/include/afs/mit-sipb-cr.h

diff --git a/src/packaging/RedHat/openafs.spec.in b/src/packaging/RedHat/openafs.spec.in
index 732f960..a114dd8 100644 (file)
--- a/src/packaging/RedHat/openafs.spec.in
+++ b/src/packaging/RedHat/openafs.spec.in
@@ -1194,9 +1194,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
 
@@ -1573,7 +1572,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}