Dirk Mueller
42bccfda0b
- Some cleanup (bsc#1206639):
* removed patch setup-tgt-conf-d.patch, since it's upstream,
and having it caused duplicated include of user config
* renamed setup-tgt-conf-d.patch to
tgt-install-examples-in-documentation-dir.patch, to better
reflect what it does (since it no longer sets up tgt.conf.d)
* removed the sytemd source file we have, since we get
tgtd.service from upstream now (with a patch)
* added patch tgt-systemd-service-update.patch, to ensure
SUSE-specific changes are in the service file
OBS-URL: https://build.opensuse.org/request/show/1045840
OBS-URL: https://build.opensuse.org/package/show/Base:System/tgt?expand=0&rev=55
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
From 4711fc19b6b83d572fd6eafd64a834559cae8ce2 Mon Sep 17 00:00:00 2001
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
Date: Wed, 26 Feb 2014 12:50:09 +0100
|
|
Subject: Install examples in documentation directory
|
|
|
|
The examples should be installed in the documentation directory,
|
|
not the standard configuration directory.
|
|
|
|
Signed-off-by: Dirk Mueller <dmueller@suse.com>
|
|
Acked-by: Hannes Reinecke <hare@suse.de>
|
|
---
|
|
conf/Makefile | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
--- a/conf/Makefile
|
|
+++ b/conf/Makefile
|
|
@@ -1,4 +1,5 @@
|
|
sysconfdir ?= /etc
|
|
+docdatadir ?= /usr/share/doc/packages/
|
|
|
|
EXAMPLES = targets.conf.example targets.conf.vtl.L700 targets.conf.vtl.MSL2024
|
|
|
|
@@ -11,9 +12,10 @@ install:
|
|
if [ ! -f $(DESTDIR)$(sysconfdir)/tgt/targets.conf ] ; then \
|
|
install -m 644 targets.conf $(DESTDIR)$(sysconfdir)/tgt ; \
|
|
fi
|
|
- install -d -m 755 $(DESTDIR)$(sysconfdir)/tgt/examples
|
|
+ install -d -m 755 $(DESTDIR)$(sysconfdir)/tgt/conf.d
|
|
+ install -d -m 755 $(DESTDIR)$(docdatadir)/tgt/examples
|
|
for f in $(EXAMPLES) ; do \
|
|
- install -m 644 examples/$$f $(DESTDIR)$(sysconfdir)/tgt/examples ;\
|
|
+ install -m 644 examples/$$f $(DESTDIR)$(docdatadir)/tgt/examples ;\
|
|
done
|
|
install -d $(DESTDIR)$(sysconfdir)/tgt/conf.d
|
|
|