Perform system installation of update service files
Separate installation step for other consumers - Partial merge of PR from Graham Weldon
This commit is contained in:
parent
aa43bb31eb
commit
b8603c3856
@ -2,6 +2,8 @@
|
|||||||
- Fix invalid test cases on command line processing
|
- Fix invalid test cases on command line processing
|
||||||
- Remove -c/--cadir flags, replace with -b/--bundledir to store
|
- Remove -c/--cadir flags, replace with -b/--bundledir to store
|
||||||
all bundles in same location
|
all bundles in same location
|
||||||
|
- Perform system installation of update service files
|
||||||
|
- Separate installation step for other consumers
|
||||||
0.9 - Use P11-Kit trust module to generate alternate certificate stores
|
0.9 - Use P11-Kit trust module to generate alternate certificate stores
|
||||||
from trust policy
|
from trust policy
|
||||||
- Only generate the trust store (and optionally NSSDB and Java PKCS#12)
|
- Only generate the trust store (and optionally NSSDB and Java PKCS#12)
|
||||||
|
40
Makefile
40
Makefile
@ -1,27 +1,43 @@
|
|||||||
MANDIR=/usr/share/man
|
MANDIR=/usr/share/man
|
||||||
SBINDIR=/usr/sbin
|
SBINDIR=/usr/sbin
|
||||||
INIT=$(shell ps -p 1 --no-header | cut -d " " -f 15)
|
|
||||||
|
|
||||||
|
all: make_ca man
|
||||||
|
|
||||||
all:
|
make_ca:
|
||||||
chmod 755 make-ca help2man
|
chmod 755 make-ca
|
||||||
|
|
||||||
|
man: make_ca
|
||||||
|
chmod 755 help2man
|
||||||
./help2man -s 8 -N ./make-ca -i include.h2m -o make-ca.8
|
./help2man -s 8 -N ./make-ca -i include.h2m -o make-ca.8
|
||||||
|
|
||||||
clean:
|
clean: clean_make_ca clean_man
|
||||||
rm -f make-ca.8
|
|
||||||
chmod 0644 help2man
|
clean_make_ca:
|
||||||
chmod 0644 make-ca
|
chmod 0644 make-ca
|
||||||
|
|
||||||
install: all
|
clean_man:
|
||||||
|
rm -f make-ca.8
|
||||||
|
chmod 0644 help2man
|
||||||
|
|
||||||
|
install: all install_bin install_man install_systemd
|
||||||
|
|
||||||
|
install_bin:
|
||||||
/usr/bin/install -vdm755 $(DESTDIR)$(SBINDIR)
|
/usr/bin/install -vdm755 $(DESTDIR)$(SBINDIR)
|
||||||
/usr/bin/install -vdm755 $(DESTDIR)$(MANDIR)/man8
|
|
||||||
install -vm755 make-ca $(DESTDIR)$(SBINDIR)
|
install -vm755 make-ca $(DESTDIR)$(SBINDIR)
|
||||||
install -vm644 make-ca.8 $(DESTDIR)$(MANDIR)/man8
|
|
||||||
if test "$(INIT)" == "systemd"; then \
|
install_systemd:
|
||||||
install -vdm755 $(DESTDIR)/etc/systemd/system; \
|
if test -d /usr/lib/systemd/system; then \
|
||||||
install -vm644 systemd/* $(DESTDIR)/etc/systemd/system; \
|
install -vdm755 ${DESTDIR}/usr/lib/systemd/system; \
|
||||||
|
install -vm644 systemd/* $(DESTDIR)/usr/lib/systemd/system; \
|
||||||
|
elif test -d /lib/systemd/system; then \
|
||||||
|
install -vdm755 ${DESTDIR}/lib/systemd/system; \
|
||||||
|
install -vm644 systemd/* ${DESTDIR}/lib/systemd/system; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
install_man:
|
||||||
|
/usr/bin/install -vdm755 $(DESTDIR)$(MANDIR)/man8
|
||||||
|
install -vm644 make-ca.8 $(DESTDIR)$(MANDIR)/man8
|
||||||
|
|
||||||
uninstall:
|
uninstall:
|
||||||
rm -f $(DESTDIR)$(SBINDIR)/make-ca
|
rm -f $(DESTDIR)$(SBINDIR)/make-ca
|
||||||
rm -f $(DESTDIR)$(MANDIR)/man8/make-ca.8
|
rm -f $(DESTDIR)$(MANDIR)/man8/make-ca.8
|
||||||
|
Loading…
Reference in New Issue
Block a user