diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2020-02-15 20:19:08 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2020-02-15 20:19:08 +0200 |
commit | 19de5926253c0b5a060997dbc0f33711336adfeb (patch) | |
tree | e4b6093243351c5d3f3bfe3ef3af96fa70839385 | |
parent | 0a5f8ec4230566295e3f5b82e6083fd5b9bb2dea (diff) | |
download | slackupgrade-19de5926253c0b5a060997dbc0f33711336adfeb.tar.gz slackupgrade-19de5926253c0b5a060997dbc0f33711336adfeb.tar.bz2 |
Fix installation directory for configuration files
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | slackupgrade | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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 |