AM_CPPFLAGS += @WITH_LIBELF_INCLUDE@
AM_CPPFLAGS += -DLOCALEDIR="\"$(localedir)\""
AM_CPPFLAGS += -DRPMCONFIGDIR="\"@RPMCONFIGDIR@\""
-AM_CPPFLAGS += -DLIBRPMALIAS_FILENAME="\"@RPMCONFIGDIR@/rpmpopt-${VERSION}\""
+AM_CPPFLAGS += -DLIBRPMALIAS_FILENAME="\"rpmpopt-${VERSION}\""
pkginclude_HEADERS =
nodist_pkginclude_HEADERS =
AM_CPPFLAGS += -DSYSCONFDIR="\"$(sysconfdir)\""
AM_CPPFLAGS += -DLOCALSTATEDIR="\"$(localstatedir)\""
AM_CPPFLAGS += -DRPMCONFIGDIR="\"@RPMCONFIGDIR@\""
-AM_CPPFLAGS += -DLIBRPMALIAS_FILENAME="\"@RPMCONFIGDIR@/rpmpopt-${VERSION}\""
+AM_CPPFLAGS += -DLIBRPMALIAS_FILENAME="\"rpmpopt-${VERSION}\""
check_PROGRAMS =
CLEANFILES =
#include <rpm/rpmgi.h>
#include <rpm/rpmlog.h>
#include <rpm/rpmstring.h>
+#include <rpm/rpmfileutil.h>
#include "debug.h"
}
optCon = poptGetContext(__progname, argc, (const char **)argv, optionsTable, 0);
- (void) poptReadConfigFile(optCon, LIBRPMALIAS_FILENAME);
+ {
+ char *poptfile = rpmGenPath(rpmConfigDir(), LIBRPMALIAS_FILENAME, NULL);
+ (void) poptReadConfigFile(optCon, poptfile);
+ free(poptfile);
+ }
#if RPM_USES_POPTREADDEFAULTCONFIG
(void) poptReadDefaultConfig(optCon, 1);
#endif
- poptSetExecPath(optCon, RPMCONFIGDIR, 1);
+ poptSetExecPath(optCon, rpmConfigDir(), 1);
/* Process all options, whine if unknown. */
while ((rc = poptGetNextOpt(optCon)) > 0) {
#include <rpm/rpmlib.h> /* RPMSIGTAG, rpmReadPackageFile .. */
#include <rpm/rpmbuild.h>
#include <rpm/rpmlog.h>
+#include <rpm/rpmfileutil.h>
#include <rpm/rpmdb.h>
#include <rpm/rpmps.h>
/* We need to handle that before dealing with the rest of the arguments. */
/* XXX popt argv definition should be fixed instead of casting... */
optCon = poptGetContext(poptCtx, argc, (const char **)argv, optionsTable, 0);
- (void) poptReadConfigFile(optCon, LIBRPMALIAS_FILENAME);
+ {
+ char *poptfile = rpmGenPath(rpmConfigDir(), LIBRPMALIAS_FILENAME, NULL);
+ (void) poptReadConfigFile(optCon, poptfile);
+ free(poptfile);
+ }
#if RPM_USES_POPTREADDEFAULTCONFIG
(void) poptReadDefaultConfig(optCon, 1);
#endif
- poptSetExecPath(optCon, RPMCONFIGDIR, 1);
+ poptSetExecPath(optCon, rpmConfigDir(), 1);
while ((arg = poptGetNextOpt(optCon)) > 0) {
optArg = poptGetOptArg(optCon);
RPMTEST="${abs_builddir}/testing"
RPMDATA="${abs_srcdir}/data/"
+RPM_CONFIGDIR="${RPMTEST}/@RPMCONFIGDIR@"
+export RPM_CONFIGDIR
+
# Popt looks into $HOME
HOME="${RPMTEST}"
export HOME