[yum-cvs] yum/etc Makefile,1.8,1.8.2.1 yum.conf,1.8,1.8.4.1

[James Bowes]

Update of /home/groups/yum/cvs/yum/etc
In directory login1.linux.duke.edu:/tmp/cvs-serv2718/etc

Modified Files:
      Tag: yum-3_0_X
	Makefile yum.conf 
Log Message:
Store all config files under /etc/yum. Fallback to the old locations if needed.

Index: Makefile
===================================================================
RCS file: /home/groups/yum/cvs/yum/etc/Makefile,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- Makefile	12 Jul 2006 05:09:19 -0000	1.8
+++ Makefile	27 Jan 2007 03:05:37 -0000	1.8.2.1
@@ -5,8 +5,10 @@
 	rm -f *.pyc *.pyo *~
 
 install:
-	mkdir -p $(DESTDIR)/etc/yum.repos.d
-	install -m 644 yum.conf $(DESTDIR)/etc/yum.conf
+	mkdir -p $(DESTDIR)/etc/yum/
+	mkdir -p $(DESTDIR)/etc/yum/repos.d
+
+	install -m 644 yum.conf $(DESTDIR)/etc/yum/yum.conf
 
 	mkdir -p $(DESTDIR)/etc/logrotate.d
 	install -m 644 yum.logrotate $(DESTDIR)/etc/logrotate.d/yum
@@ -17,7 +19,6 @@
 	mkdir -p $(DESTDIR)/etc/dbus-1/system.d/
 	install -m 755 yum-updatesd-dbus.conf $(DESTDIR)/etc/dbus-1/system.d/yum-updatesd.conf
 
-	mkdir -p $(DESTDIR)/etc/yum/
 	install -m 755 yum-updatesd.conf $(DESTDIR)/etc/yum/yum-updatesd.conf
 
 

Index: yum.conf
===================================================================
RCS file: /home/groups/yum/cvs/yum/etc/yum.conf,v
retrieving revision 1.8
retrieving revision 1.8.4.1
diff -u -r1.8 -r1.8.4.1
--- yum.conf	4 Mar 2006 16:09:02 -0000	1.8
+++ yum.conf	27 Jan 2007 03:05:37 -0000	1.8.4.1
@@ -11,7 +11,7 @@
 
 
 # PUT YOUR REPOS HERE OR IN separate files named file.repo
-# in /etc/yum.repos.d
+# in /etc/yum/repos.d
 #[base]
 #name=Red Hat Linux $releasever - $basearch - Base
 #baseurl=http://mirror.dulug.duke.edu/pub/yum-repository/redhat/$releasever/$basearch/