Call RPM_CONFIGDIR just that consistently

For whatever historical reasons RPMCONFIGDIR was used in automake whereas the environment variable is RPM_CONFIGDIR. Just call it that everywhere.
zengwei00 · Mar 30, 2023 · 97c9d89 · 97c9d89
1 parent a2b4927
commit 97c9d89
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 17 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,7 +31,7 @@ option(WITH_AUDIT "Build with audit support" ON)
 option(WITH_FSVERITY "Build with fsverity support" OFF)
 option(WITH_IMAEVM "Build with IMA support" OFF)
 
-set(RPMCONFIGDIR "${CMAKE_INSTALL_PREFIX}/lib/rpm" CACHE PATH "rpm home")
+set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/lib/rpm" CACHE PATH "rpm home")
 set(RPM_VENDOR "vendor" CACHE STRING "rpm vendor string")
 
 # emulate libtool versioning
@@ -104,7 +104,7 @@ function(makemacros)
 	configure_file(rpm.pc.in rpm.pc @ONLY)
 
 	install(CODE "execute_process(COMMAND
-		${CMAKE_COMMAND} -E env pkglibdir=${RPMCONFIGDIR}
+		${CMAKE_COMMAND} -E env pkglibdir=${RPM_CONFIGDIR}
 			${CMAKE_SOURCE_DIR}/installplatform
 			rpmrc platform macros
 			${RPMCANONVENDOR} ${RPMCANONOS} ${RPMCANONGNU})"
@@ -368,11 +368,11 @@ install(TARGETS
 	rpm rpmdb rpmkeys rpm2cpio rpmsign rpmbuild rpmspec
 	rpmlua rpmgraph rpmsort
 )
-install(TARGETS elfdeps rpmdeps rpmuncompress DESTINATION ${RPMCONFIGDIR})
+install(TARGETS elfdeps rpmdeps rpmuncompress DESTINATION ${RPM_CONFIGDIR})
 
 makemacros()
 foreach(f macros rpmrc rpmpopt-${PROJECT_VERSION})
-	install(FILES ${CMAKE_BINARY_DIR}/${f} DESTINATION ${RPMCONFIGDIR})
+	install(FILES ${CMAKE_BINARY_DIR}/${f} DESTINATION ${RPM_CONFIGDIR})
 endforeach()
 
 if (ENABLE_TESTSUITE)
@@ -386,8 +386,8 @@ if (ENABLE_TESTSUITE)
 endif()
 
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/rpm.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-install(DIRECTORY DESTINATION ${RPMCONFIGDIR}/lua)
-install(DIRECTORY DESTINATION ${RPMCONFIGDIR}/macros.d)
+install(DIRECTORY DESTINATION ${RPM_CONFIGDIR}/lua)
+install(DIRECTORY DESTINATION ${RPM_CONFIGDIR}/macros.d)
 install(FILES CONTRIBUTING.md COPYING CREDITS INSTALL README TYPE DOC)
 
 function(add_tarball targetname namever treeish)

diff --git a/fileattrs/CMakeLists.txt b/fileattrs/CMakeLists.txt
@@ -2,5 +2,5 @@ install(FILES
 	debuginfo.attr desktop.attr elf.attr font.attr metainfo.attr
 	perl.attr perllib.attr pkgconfig.attr ocaml.attr
 	rpm_macro.attr script.attr
-	DESTINATION ${RPMCONFIGDIR}/fileattrs
+	DESTINATION ${RPM_CONFIGDIR}/fileattrs
 )
diff --git a/macros.in b/macros.in
@@ -1,4 +1,4 @@
-#/*! \page config_macros Default configuration: @RPMCONFIGDIR@/macros
+#/*! \page config_macros Default configuration: @RPMHOME@/macros
 # \verbatim
 #
 # This is a global RPM configuration file. All changes made here will

diff --git a/rpm.pc.in b/rpm.pc.in
@@ -2,7 +2,7 @@ prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=@CMAKE_INSTALL_PREFIX@
 libdir=@CMAKE_INSTALL_FULL_LIBDIR@
 includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-rpmhome=@RPMCONFIGDIR@
+rpmhome=@RPM_CONFIGDIR@
 
 Name: @CMAKE_PROJECT_NAME@
 Description: @CMAKE_PROJECT_DESCRIPTION@

diff --git a/rpmio/CMakeLists.txt b/rpmio/CMakeLists.txt
@@ -7,7 +7,7 @@ target_sources(librpmio PRIVATE
 	rpmver.c rpmstring.c rpmfileutil.c rpmglob.c rpmkeyring.c
 	rpmstrpool.c rpmmacro_internal.h rpmlua.c rpmlua.h lposix.c
 )
-target_compile_definitions(librpmio PRIVATE RPMCONFIGDIR="${RPMCONFIGDIR}")
+target_compile_definitions(librpmio PRIVATE RPM_CONFIGDIR="${RPM_CONFIGDIR}")
 
 if (WITH_INTERNAL_OPENPGP)
 	target_sources(librpmio PRIVATE rpmpgp_internal.h rpmpgp_internal.c)

diff --git a/rpmio/rpmfileutil.c b/rpmio/rpmfileutil.c
@@ -482,7 +482,7 @@ int rpmMkdirs(const char *root, const char *pathstr)
 static void setConfigDir(void)
 {
     char *rpmenv = getenv("RPM_CONFIGDIR");
-    rpm_config_dir = rpmenv ? xstrdup(rpmenv) : RPMCONFIGDIR;
+    rpm_config_dir = rpmenv ? xstrdup(rpmenv) : RPM_CONFIGDIR;
 }
 
 const char *rpmConfigDir(void)

diff --git a/rpmpopt.in b/rpmpopt.in
@@ -1,4 +1,4 @@
-#/*! \page config_rpmpopt Default configuration: @RPMCONFIGDIR@/rpmpopt-@PROJECT_VERSION@
+#/*! \page config_rpmpopt Default configuration: @RPM_CONFIGDIR@/rpmpopt-@PROJECT_VERSION@
 # \verbatim
 #
 # This file *should not be modified*. Local customizations

diff --git a/rpmrc.in b/rpmrc.in
@@ -1,4 +1,4 @@
-#/*! \page config_rpmrc Default configuration: @RPMCONFIGDIR@/rpmrc
+#/*! \page config_rpmrc Default configuration: @RPM_CONFIGDIR@/rpmrc
 # \verbatim
 #
 # This is a global RPM configuration file. All changes made here will

diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
@@ -12,9 +12,9 @@ install(PROGRAMS
 	rpm_macros_provides.sh
 	rpmdb_dump rpmdb_load
 	rpm2cpio.sh tgpg
-	DESTINATION ${RPMCONFIGDIR}
+	DESTINATION ${RPM_CONFIGDIR}
 )
 install(FILES
 	rpm.daily rpm.log rpm.supp
-	DESTINATION ${RPMCONFIGDIR}
+	DESTINATION ${RPM_CONFIGDIR}
 )
diff --git a/tests/atlocal.in b/tests/atlocal.in
@@ -30,7 +30,7 @@ fi
 RPMTEST="${abs_builddir}/testing"
 RPMDATA="${abs_srcdir}/data/"
 
-RPM_CONFIGDIR="${RPMTEST}/@RPMCONFIGDIR@"
+RPM_CONFIGDIR="${RPMTEST}/@RPM_CONFIGDIR@"
 RPM_POPTEXEC_PATH="${RPMTEST}/@usrbindir@"
 export RPM_CONFIGDIR RPM_POPTEXEC_PATH
 
@@ -84,7 +84,7 @@ function setup_env()
     if [ -d testing ]; then
         RPMTEST=${PWD}/testing
         HOME=${RPMTEST}
-        RPM_CONFIGDIR=${RPMTEST}/@RPMCONFIGDIR@
+        RPM_CONFIGDIR=${RPMTEST}/@RPM_CONFIGDIR@
         export RPMTEST HOME RPM_CONFIGDIR
     fi
 }