head	1.1;
access;
symbols
	RELEASE_8_3_0:1.1
	RELEASE_9_0_0:1.1
	RELEASE_7_4_0:1.1
	RELEASE_8_2_0:1.1
	RELEASE_6_EOL:1.1
	RELEASE_8_1_0:1.1
	RELEASE_7_3_0:1.1
	RELEASE_8_0_0:1.1
	RELEASE_7_2_0:1.1
	RELEASE_7_1_0:1.1
	RELEASE_6_4_0:1.1
	RELEASE_5_EOL:1.1
	RELEASE_7_0_0:1.1
	RELEASE_6_3_0:1.1
	PRE_XORG_7:1.1
	RELEASE_4_EOL:1.1
	RELEASE_6_2_0:1.1
	RELEASE_6_1_0:1.1
	RELEASE_5_5_0:1.1
	RELEASE_6_0_0:1.1
	RELEASE_5_4_0:1.1
	RELEASE_4_11_0:1.1
	RELEASE_5_3_0:1.1
	RELEASE_4_10_0:1.1
	RELEASE_5_2_1:1.1
	RELEASE_5_2_0:1.1
	RELEASE_4_9_0:1.1
	RELEASE_5_1_0:1.1
	RELEASE_4_8_0:1.1
	RELEASE_5_0_0:1.1
	RELEASE_4_7_0:1.1
	RELEASE_4_6_2:1.1
	RELEASE_4_6_1:1.1
	RELEASE_4_6_0:1.1
	RELEASE_5_0_DP1:1.1
	RELEASE_4_5_0:1.1
	RELEASE_4_4_0:1.1
	RELEASE_4_3_0:1.1
	RELEASE_4_2_0:1.1;
locks; strict;
comment	@# @;


1.1
date	2000.10.17.08.42.03;	author nakai;	state Exp;
branches;
next	;


desc
@@


1.1
log
@Update to 3.0.6

PR:		misc/21801
Submitted by:	KATO Tsuguru <tkato@@prontomail.ne.jp>
@
text
@--- lib/rpmrc.c.orig	Thu Sep 14 02:29:18 2000
+++ lib/rpmrc.c	Wed Oct  4 23:03:36 2000
@@@@ -13,7 +13,7 @@@@
 
 #include "misc.h"
 
-static const char *defrcfiles = LIBRPMRC_FILENAME ":/etc/rpmrc:~/.rpmrc";
+static const char *defrcfiles = LIBRPMRC_FILENAME ":%%PREFIX%%/etc/rpmrc:~/.rpmrc";
 
 struct machCacheEntry {
     const char * name;
@@@@ -858,7 +858,7 @@@@
 	    /* we are on ncr-sysv4 */
 	    char *prelid = NULL;
 	    FD_t fd;
-	    fd = Fopen("/etc/.relid", "r.fdio");
+	    fd = Fopen("%%PREFIX%%/etc/.relid", "r.fdio");
 	    if (!Ferror(fd)) {
 		chptr = (char *) xcalloc(1, 256);
 		if (chptr != NULL) {
@
