From e8fdc3eca967f4fa614f0c1766cadcb3db04a295 Mon Sep 17 00:00:00 2001
From: rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>
Date: Thu, 4 Dec 2008 01:01:54 +0000
Subject: fix on default config files folder

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@636 04377dda-e619-0410-9926-eae83683ac58
---
 trunk/Makefile      | 4 ++--
 trunk/lib/common.sh | 2 +-
 trunk/src/simplaret | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'trunk')

diff --git a/trunk/Makefile b/trunk/Makefile
index 28bab0d..a0c0dd3 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -53,8 +53,8 @@ install_doc:
 	$(INSTALL) -D --mode=0644 doc/README.simplaret.pt_BR $(DESTDIR)/$(PREFIX)/doc/$(PACKAGE)-$(VERSION)/README.simplaret.pt_BR
 
 install_config:
-	$(INSTALL) -D --mode=0644 conf/$(PACKAGE).conf $(DESTDIR)/etc/$(PACKAGE)/default/$(PACKAGE).conf
-	$(INSTALL) -D --mode=0644 conf/repos.conf $(DESTDIR)/etc/$(PACKAGE)/default/repos.conf
+	$(INSTALL) -D --mode=0644 conf/$(PACKAGE).conf $(DESTDIR)/etc/$(PACKAGE)/defaults/$(PACKAGE).conf
+	$(INSTALL) -D --mode=0644 conf/repos.conf $(DESTDIR)/etc/$(PACKAGE)/defaults/repos.conf
 	@mkdir -p $(DESTDIR)/etc/$(PACKAGE)/defaults/mkbuild/
 	@cp mkbuild/* $(DESTDIR)/etc/$(PACKAGE)/defaults/mkbuild/
 
diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh
index f9c115f..7b7aca9 100644
--- a/trunk/lib/common.sh
+++ b/trunk/lib/common.sh
@@ -20,7 +20,7 @@
 
 BASE_CONF="/etc/simplepkg"
 CONF="$BASE_CONF/simplepkg.conf"
-DEFAULT_CONF="$BASE_CONF/default/simplepkg.conf"
+DEFAULT_CONF="$BASE_CONF/defaults/simplepkg.conf"
 JAIL_LIST="$BASE_CONF/jailist"
 SIMPLARET="simplaret"
 
diff --git a/trunk/src/simplaret b/trunk/src/simplaret
index ec24ded..cbf4543 100755
--- a/trunk/src/simplaret
+++ b/trunk/src/simplaret
@@ -31,7 +31,7 @@ fi
 if [ -f "/etc/simplepkg/repos.conf" ]; then
   REPOS_CONF="/etc/simplepkg/repos.conf"
 else
-  REPOS_CONF="/etc/simplepkg/default/repos.conf"
+  REPOS_CONF="/etc/simplepkg/defaults/repos.conf"
 fi
 
 function simplaret_usage {
-- 
cgit v1.2.3