aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org>2020-02-15 20:19:08 +0200
committerSergey Poznyakoff <gray@gnu.org>2020-02-15 20:19:08 +0200
commit19de5926253c0b5a060997dbc0f33711336adfeb (patch)
treee4b6093243351c5d3f3bfe3ef3af96fa70839385
parent0a5f8ec4230566295e3f5b82e6083fd5b9bb2dea (diff)
downloadslackupgrade-19de5926253c0b5a060997dbc0f33711336adfeb.tar.gz
slackupgrade-19de5926253c0b5a060997dbc0f33711336adfeb.tar.bz2
Fix installation directory for configuration files
-rw-r--r--Makefile2
-rw-r--r--slackupgrade2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 4d67620..632b95d 100644
--- a/Makefile
+++ b/Makefile
@@ -12,25 +12,25 @@
12# GNU General Public License for more details. 12# GNU General Public License for more details.
13# 13#
14# You should have received a copy of the GNU General Public License 14# You should have received a copy of the GNU General Public License
15# along with slackupgrade. If not, see 15# along with slackupgrade. If not, see
16# <http://www.gnu.org/licenses/>. 16# <http://www.gnu.org/licenses/>.
17 17
18PACKAGE = slackupgrade 18PACKAGE = slackupgrade
19VERSION = 1.0 19VERSION = 1.0
20 20
21SBINDIR = /sbin 21SBINDIR = /sbin
22MANDIR = /usr/man 22MANDIR = /usr/man
23MAN8DIR = $(MANDIR)/man8 23MAN8DIR = $(MANDIR)/man8
24CONFDIR = /etc/slackware-system-upgrade 24CONFDIR = /etc/$(PACKAGE)
25CONFFILES = conf/14.0-14.1.repl conf/14.1-14.2.repl 25CONFFILES = conf/14.0-14.1.repl conf/14.1-14.2.repl
26 26
27help:; 27help:;
28 @echo "Avalable targets:" 28 @echo "Avalable targets:"
29 @echo "" 29 @echo ""
30 @echo "$$ make install" 30 @echo "$$ make install"
31 @echo " Installs the program. Influential variables:" 31 @echo " Installs the program. Influential variables:"
32 @echo " SBINDIR - directory to install system binaries to ($(SBINDIR))" 32 @echo " SBINDIR - directory to install system binaries to ($(SBINDIR))"
33 @echo " MANDIR - toplevel directory for man page installation ($(MANDIR))" 33 @echo " MANDIR - toplevel directory for man page installation ($(MANDIR))"
34 @echo "" 34 @echo ""
35 @echo "$$ make install-sbin" 35 @echo "$$ make install-sbin"
36 @echo " Installs only the slackupgrade script." 36 @echo " Installs only the slackupgrade script."
diff --git a/slackupgrade b/slackupgrade
index 30bfa9c..e4335a0 100644
--- a/slackupgrade
+++ b/slackupgrade
@@ -567,25 +567,25 @@ do
567 abend "no files in series $series" 567 abend "no files in series $series"
568 fi 568 fi
569 file=$(getfile $n) 569 file=$(getfile $n)
570 if [ -z "$file" ]; then 570 if [ -z "$file" ]; then
571 abend "exiting" 571 abend "exiting"
572 fi 572 fi
573 dropfile $file 573 dropfile $file
574done 574done
575 575
576# Build a list of installed packages 576# Build a list of installed packages
577ls /var/log/packages |\ 577ls /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
583 all_package_names 583 all_package_names
584else 584else
585 comm -1 -2 $installed_list $avail_list 585 comm -1 -2 $installed_list $avail_list
586fi 586fi
587for s in $install_series 587for s in $install_series
588do 588do
589 series_package_names $s 589 series_package_names $s
590done 590done
591if [ -n "$install_packages" ]; then 591if [ -n "$install_packages" ]; then

Return to:

Send suggestions and report system problems to the System administrator.