RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 02-Jul-2007 10:53:29
Branch: HEAD Handle: 2007070209532900
Modified files:
rpm/lib rpmds.c rpmrc.c
Log:
do not hard-code the config directory /etc/rpm, use the existing
SYSCONFIGDIR #define which especially can be configured to a different
directory during build-time, too
Summary:
Revision Changes Path
2.59 +1 -1 rpm/lib/rpmds.c
2.200 +1 -1 rpm/lib/rpmrc.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/lib/rpmds.c
============================================================================
$ cvs diff -u -r2.58 -r2.59 rpmds.c
--- rpm/lib/rpmds.c 21 Jun 2007 12:00:08 -0000 2.58
+++ rpm/lib/rpmds.c 2 Jul 2007 08:53:29 -0000 2.59
@@ -1607,7 +1607,7 @@
return rc;
}
-#define _ETC_RPM_SYSINFO "/etc/rpm/sysinfo"
+#define _ETC_RPM_SYSINFO SYSCONFIGDIR "/sysinfo"
/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ /[EMAIL
PROTECTED]@*/
static const char *_sysinfo_path = NULL;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmrc.c
============================================================================
$ cvs diff -u -r2.199 -r2.200 rpmrc.c
--- rpm/lib/rpmrc.c 29 Jun 2007 12:28:41 -0000 2.199
+++ rpm/lib/rpmrc.c 2 Jul 2007 08:53:29 -0000 2.200
@@ -31,7 +31,7 @@
static const char * configTarget = NULL;
/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
-static const char * platform = "/etc/rpm/platform";
+static const char * platform = SYSCONFIGDIR "/platform";
/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
void * platpat = NULL;
/[EMAIL PROTECTED]@*/
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
