2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 4d67620..632b95d 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ VERSION   = 1.0
 SBINDIR   = /sbin
 MANDIR    = /usr/man
 MAN8DIR   = $(MANDIR)/man8
-CONFDIR   = /etc/slackware-system-upgrade
+CONFDIR   = /etc/$(PACKAGE)
 CONFFILES = conf/14.0-14.1.repl conf/14.1-14.2.repl
 help:;
diff --git a/slackupgrade b/slackupgrade
index 30bfa9c..e4335a0 100644
--- a/slackupgrade
+++ b/slackupgrade
@@ -576,7 +576,7 @@ done
 # Build a list of installed packages
 ls /var/log/packages |\
 sed -r -e 's/-[^-]+-(i386|x86(_64)?|arm|noarch|fw)-[[:digit:]]+(_.*)?//' |\
- sort > $installed_list
+ sort -u > $installed_list
 # Build a list of packages to install
 (if [ -n "$install_all" ]; then

diff --git a/Makefile b/Makefile index 4d67620..632b95d 100644 --- a/Makefile +++ b/Makefile
@@ -21,7 +21,7 @@ VERSION = 1.0
21	SBINDIR = /sbin	21	SBINDIR = /sbin
22	MANDIR = /usr/man	22	MANDIR = /usr/man
23	MAN8DIR = $(MANDIR)/man8	23	MAN8DIR = $(MANDIR)/man8
24	CONFDIR = /etc/slackware-system-upgrade	24	CONFDIR = /etc/$(PACKAGE)
25	CONFFILES = conf/14.0-14.1.repl conf/14.1-14.2.repl	25	CONFFILES = conf/14.0-14.1.repl conf/14.1-14.2.repl
26		26
27	help:;	27	help:;


diff --git a/slackupgrade b/slackupgrade index 30bfa9c..e4335a0 100644 --- a/slackupgrade +++ b/slackupgrade
@@ -576,7 +576,7 @@ done
576	# Build a list of installed packages	576	# Build a list of installed packages
577	ls /var/log/packages \|\	577	ls /var/log/packages \|\
578	sed -r -e 's/-[^-]+-(i386\|x86(_64)?\|arm\|noarch\|fw)-[[:digit:]]+(_.*)?//' \|\	578	sed -r -e 's/-[^-]+-(i386\|x86(_64)?\|arm\|noarch\|fw)-[[:digit:]]+(_.*)?//' \|\
579	sort > $installed_list	579	sort -u > $installed_list
580		580
581	# Build a list of packages to install	581	# Build a list of packages to install
582	(if [ -n "$install_all" ]; then	582	(if [ -n "$install_all" ]; then