From 19de5926253c0b5a060997dbc0f33711336adfeb Mon Sep 17 00:00:00 2001
From: Sergey Poznyakoff <gray@gnu.org>
Date: Sat, 15 Feb 2020 20:19:08 +0200
Subject: Fix installation directory for configuration files

---
 Makefile     | 2 +-
 slackupgrade | 2 +-
 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
-- 
cgit v1.2.1