From c321cb467220bbdf2ff49d5fa6e052fd27a4df5e Mon Sep 17 00:00:00 2001 From: Simon Wilkinson 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/http://gerrit.openafs.org/175 Tested-by: Derrick Brashear Reviewed-by: Derrick Brashear --- .../pod1/{compile_et.pod => afs_compile_et.pod} | 12 ++++++------ src/comerr/Makefile.in | 4 ++-- src/packaging/RedHat/openafs.spec.in | 5 ++--- 3 files changed, 10 insertions(+), 11 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 cfdb146c4..4f15a659c 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
-B [B<-debug>] S<<< [B<-language> >] >>> +B [B<-debug>] S<<< [B<-language> >] >>> S<<< [B<-prefix> >] >>> [B<-v> >] > =for html @@ -15,7 +15,7 @@ B [B<-debug>] S<<< [B<-language> >] >>> =head1 DESCRIPTION -The B command builds the error text tables for compilation. +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. @@ -29,7 +29,7 @@ named F. This command is used internally within the build process for OpenAFS. Most users will access this information via L rather than -via B. +via B. 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 and F, 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 71451f0b8..1159918e0 100644 --- 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 732f960ab..a114dd8a7 100644 --- 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} -- 2.39.5