mirror of
https://github.com/ibm-s390-linux/s390-tools.git
synced 2026-08-05 02:14:52 +00:00
scripts/dumpconf: Bring installation rules in line with other scripts
Until recently dumpconf might have been installed in two different locations, /etc/init.d/ and /lib/s390-tools/. As dumpconf is now part of the helper scripts in the scripts directory, extend the installation rule and add the %S390_TOOLS_VERSION% wildcard to the script along the way for correct version output. The installation rule in the systemd/Makefile is removed, bringing it in line with cpictl. Acked-by: Stefan Haberland <sth@linux.ibm.com> Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
This commit is contained in:
@@ -2,6 +2,8 @@ include ../common.mak
|
||||
|
||||
SCRIPTS = dbginfo.sh zfcpdbf zipl-switch-to-blscfg scsi_logging_level
|
||||
SCRIPTS += sclpdbf
|
||||
# Helper scripts controlled by corresponding systemd services
|
||||
SD_HELPER_SCRIPTS = cpictl dumpconf
|
||||
MAN_PAGES = dbginfo.sh.1 zfcpdbf.1 zipl-switch-to-blscfg.1
|
||||
|
||||
all:
|
||||
@@ -17,10 +19,14 @@ install:
|
||||
chmod 755 $(DESTDIR)$(BINDIR)/$$i; \
|
||||
done
|
||||
|
||||
sed -e 's/%S390_TOOLS_VERSION%/$(S390_TOOLS_RELEASE)/' cpictl > \
|
||||
$(DESTDIR)$(TOOLS_LIBDIR)/cpictl
|
||||
chown $(OWNER):$(GROUP) $(DESTDIR)$(TOOLS_LIBDIR)/cpictl
|
||||
chmod 755 $(DESTDIR)$(TOOLS_LIBDIR)/cpictl
|
||||
@for i in $(SD_HELPER_SCRIPTS); \
|
||||
do \
|
||||
cat $$i | \
|
||||
sed -e 's/%S390_TOOLS_VERSION%/$(S390_TOOLS_RELEASE)/' \
|
||||
>$(DESTDIR)$(TOOLS_LIBDIR)/$$i; \
|
||||
chown $(OWNER):$(GROUP) $(DESTDIR)$(TOOLS_LIBDIR)/$$i; \
|
||||
chmod 755 $(DESTDIR)$(TOOLS_LIBDIR)/$$i; \
|
||||
done
|
||||
|
||||
@for i in $(MAN_PAGES); \
|
||||
do \
|
||||
|
||||
@@ -101,7 +101,7 @@ EOF
|
||||
printversion()
|
||||
{
|
||||
cat <<EOF
|
||||
dumpconf: zSeries dump configuration script version 1.1
|
||||
dumpconf: zSeries dump configuration script version %S390_TOOLS_VERSION%
|
||||
Copyright IBM Corp. 2006, 2022
|
||||
EOF
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user