folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Panu Matilainen 2023-03-30 11:38:04 +03:00
parent a2b49273aa
commit 97c9d8903c
10 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

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

2
fileattrs/CMakeLists.txt
View File

@ -2,5 +2,5 @@ install(FILES
debuginfo.attr desktop.attr elf.attr font.attr metainfo.attr debuginfo.attr desktop.attr elf.attr font.attr metainfo.attr
perl.attr perllib.attr pkgconfig.attr ocaml.attr perl.attr perllib.attr pkgconfig.attr ocaml.attr
rpm_macro.attr script.attr rpm_macro.attr script.attr
DESTINATION ${RPMCONFIGDIR}/fileattrs DESTINATION ${RPM_CONFIGDIR}/fileattrs
) )

2
macros.in
View File

@ -1,4 +1,4 @@
#/*! \page config_macros Default configuration: @RPMCONFIGDIR@/macros #/*! \page config_macros Default configuration: @RPMHOME@/macros
# \verbatim # \verbatim
# #
# This is a global RPM configuration file. All changes made here will # This is a global RPM configuration file. All changes made here will

2
rpm.pc.in
View File

@ -2,7 +2,7 @@ prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=@CMAKE_INSTALL_PREFIX@
libdir=@CMAKE_INSTALL_FULL_LIBDIR@ libdir=@CMAKE_INSTALL_FULL_LIBDIR@
includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
rpmhome=@RPMCONFIGDIR@ rpmhome=@RPM_CONFIGDIR@
Name: @CMAKE_PROJECT_NAME@ Name: @CMAKE_PROJECT_NAME@
Description: @CMAKE_PROJECT_DESCRIPTION@ Description: @CMAKE_PROJECT_DESCRIPTION@

2
rpmio/CMakeLists.txt
View File

@ -7,7 +7,7 @@ target_sources(librpmio PRIVATE
rpmver.c rpmstring.c rpmfileutil.c rpmglob.c rpmkeyring.c rpmver.c rpmstring.c rpmfileutil.c rpmglob.c rpmkeyring.c
rpmstrpool.c rpmmacro_internal.h rpmlua.c rpmlua.h lposix.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) if (WITH_INTERNAL_OPENPGP)
target_sources(librpmio PRIVATE rpmpgp_internal.h rpmpgp_internal.c) target_sources(librpmio PRIVATE rpmpgp_internal.h rpmpgp_internal.c)

2
rpmio/rpmfileutil.c
View File

@ -482,7 +482,7 @@ int rpmMkdirs(const char *root, const char *pathstr)
static void setConfigDir(void) static void setConfigDir(void)
{ {
char *rpmenv = getenv("RPM_CONFIGDIR"); char *rpmenv = getenv("RPM_CONFIGDIR");
rpm_config_dir = rpmenv ? xstrdup(rpmenv) : RPMCONFIGDIR; rpm_config_dir = rpmenv ? xstrdup(rpmenv) : RPM_CONFIGDIR;
} }
const char *rpmConfigDir(void) const char *rpmConfigDir(void)

2
rpmpopt.in
View File

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

2
rpmrc.in
View File

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

4
scripts/CMakeLists.txt
View File

@ -12,9 +12,9 @@ install(PROGRAMS
rpm_macros_provides.sh rpm_macros_provides.sh
rpmdb_dump rpmdb_load rpmdb_dump rpmdb_load
rpm2cpio.sh tgpg rpm2cpio.sh tgpg
DESTINATION ${RPMCONFIGDIR} DESTINATION ${RPM_CONFIGDIR}
) )
install(FILES install(FILES
rpm.daily rpm.log rpm.supp rpm.daily rpm.log rpm.supp
DESTINATION ${RPMCONFIGDIR} DESTINATION ${RPM_CONFIGDIR}
) )

4
tests/atlocal.in
View File

@ -30,7 +30,7 @@ fi
RPMTEST="${abs_builddir}/testing" RPMTEST="${abs_builddir}/testing"
RPMDATA="${abs_srcdir}/data/" RPMDATA="${abs_srcdir}/data/"
RPM_CONFIGDIR="${RPMTEST}/@RPMCONFIGDIR@" RPM_CONFIGDIR="${RPMTEST}/@RPM_CONFIGDIR@"
RPM_POPTEXEC_PATH="${RPMTEST}/@usrbindir@" RPM_POPTEXEC_PATH="${RPMTEST}/@usrbindir@"
export RPM_CONFIGDIR RPM_POPTEXEC_PATH export RPM_CONFIGDIR RPM_POPTEXEC_PATH
@ -84,7 +84,7 @@ function setup_env()
if [ -d testing ]; then if [ -d testing ]; then
RPMTEST=${PWD}/testing RPMTEST=${PWD}/testing
HOME=${RPMTEST} HOME=${RPMTEST}
RPM_CONFIGDIR=${RPMTEST}/@RPMCONFIGDIR@ RPM_CONFIGDIR=${RPMTEST}/@RPM_CONFIGDIR@
export RPMTEST HOME RPM_CONFIGDIR export RPMTEST HOME RPM_CONFIGDIR
fi fi
} }