# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1262811844 -3600
# Node ID 3a410bbead4cd04fe720f52d855ae9c95532a82f
# Parent  8a8843396ec55c47c4b634aceb38f8d39745645c
Mouved file path to a config file (/etc/slitaz/tazpkg.conf)

diff -r 8a8843396ec5 -r 3a410bbead4c Makefile
--- a/Makefile	Fri Dec 25 14:42:53 2009 +0100
+++ b/Makefile	Wed Jan 06 22:04:04 2010 +0100
@@ -3,6 +3,7 @@
 PREFIX?=/usr
 DOCDIR?=$(PREFIX)/share/doc
 LIBDIR?=$(PREFIX)/lib/slitaz
+SYSCONFDIR?=/etc/slitaz
 
 all:
 	grep "^VERSION=[0-9]" tazpkg | sed 's/VERSION=//'
@@ -15,6 +16,9 @@
 	@echo "Installing Tazpkgbox lib into $(LIBDIR)..."
 	install -g root -o root -m 0755 -d $(LIBDIR)
 	cp -a lib/tazpkgbox $(LIBDIR)
+	@echo "Installing configuration files..."
+	install -g root -o root -m 0755 -d $(SYSCONFDIR)
+	install -g root -o root -m 0644 tazpkg.conf $(SYSCONFDIR)
 	@echo "Installing documentation files..."
 	install -g root -o root -m 0755 -d $(DOCDIR)/tazpkg
 	install -g root -o root -m 0644 doc/* $(DOCDIR)/tazpkg
diff -r 8a8843396ec5 -r 3a410bbead4c tazpkg
--- a/tazpkg	Fri Dec 25 14:42:53 2009 +0100
+++ b/tazpkg	Wed Jan 06 22:04:04 2010 +0100
@@ -7,38 +7,23 @@
 # use 'tazpkg usage' to get a list of commands with short descriptions. Tazpkg
 # also resolves dependencies and can upgrade packages from a mirror.
 #
-# (C) 2007-2008 SliTaz - GNU General Public License v3.
+# (C) 2007-2010 SliTaz - GNU General Public License v3.
 #
 # Authors : Christophe Lincoln <pankso@slitaz.org>
 #           Pascal Bellard <pascal.bellard@slitaz.org>
 #           Eric Joseph-Alexandre <erjo@slitaz.org>
 #           Paul Issott <paul@slitaz.org>
 #
-VERSION=3.1
+VERSION=3.2
 
 ####################
 # Script variables #
 ####################
 
-# Packages categories.
-CATEGORIES="
-base-system
-x-window
-utilities
-network
-graphics
-multimedia
-office
-development
-system-tools
-security
-games
-misc
-meta
-non-free"
+. /etc/slitaz/tazpkg.conf
 
-# Initialize some variables to use words
-# rather than numbers for functions and actions.
+# Initialize some variables to use words rather than numbers for functions
+# and actions.
 COMMAND=$1
 if [ -f "$2" ]; then
 	# Set pkg basename for install, extract
@@ -50,17 +35,13 @@
 PACKAGE_FILE=$2
 TARGET_DIR=$3
 TOP_DIR=`pwd`
-TMP_DIR=/tmp/tazpkg-$$-$RANDOM
+INSTALL_LIST=""
 
 # Path to tazpkg used dir and configuration files
-LOCALSTATE=/var/lib/tazpkg
 INSTALLED=$LOCALSTATE/installed
-CACHE_DIR=/var/cache/tazpkg
 MIRROR=$LOCALSTATE/mirror
 BLOCKED=$LOCALSTATE/blocked-packages.list
 DEFAULT_MIRROR="http://mirror.slitaz.org/packages/`cat /etc/slitaz-release`/"
-INSTALL_LIST=""
-LOG=/var/log/tazpkg.log
 
 # Messages language setting --> line 230.
 case $LANG in
diff -r 8a8843396ec5 -r 3a410bbead4c tazpkg.conf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tazpkg.conf	Wed Jan 06 22:04:04 2010 +0100
@@ -0,0 +1,31 @@
+# /etc/slitaz/tazpkg.conf: SliTaz package manager configuration file.
+#
+
+# Path to all packages meta files (lists, receipt, desc).
+LOCALSTATE="/var/lib/tazpkg"
+
+# Path to downloaded packages by get-intall command.
+CACHE_DIR="/var/cache/tazpkg"
+
+# Path to Tazpkg log file.
+LOG="/var/log/tazpkg.log"
+
+# Path to the temporary directory used to extract package.
+TMP_DIR="/tmp/tazpkg-$$-$RANDOM"
+
+# Packages categories.
+CATEGORIES="
+base-system
+x-window
+utilities
+network
+graphics
+multimedia
+office
+development
+system-tools
+security
+games
+misc
+meta
+non-free"