From 559718974e75d1348b9e18456dfa6fd099ad3419 Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@inf.ed.ac.uk>
Date: Wed, 22 Jul 2009 01:11:15 +0100
Subject: [PATCH] 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 <shadow@dementia.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from c321cb467220bbdf2ff49d5fa6e052fd27a4df5e)
Change-Id: I6de96fd2056a632dc8770b5da73604dd20f8c125
Reviewed-on: http://gerrit.openafs.org/992
---
 .../pod1/{compile_et.pod => afs_compile_et.pod}      | 12 ++++++------
 src/comerr/Makefile.in                               |  8 ++++----
 src/packaging/RedHat/openafs.spec.in                 |  5 ++---
 3 files changed, 12 insertions(+), 13 deletions(-)
 rename doc/man-pages/pod1/{compile_et.pod => afs_compile_et.pod} (84%)

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 cfdb146c48..4f15a659c0 100644
--- 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 2dba67874d..4102de1379 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 889c0b26a1..45402dd54b 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}