freeipmi/adapt_to_suse_docdir.patch

71 lines
1.8 KiB
Diff
Raw Normal View History

From: Thomas Renninger <trenn@suse.de>
Subject: Do not override docdir
./configure --docdir=
does not work. Simply removing the override
makes it use the default docdir.
Also use $docdir in subfolders.
---
Makefile.am | 1 -
contrib/Makefile.am | 8 ++++----
doc/Makefile.am | 2 --
3 files changed, 4 insertions(+), 7 deletions(-)
Index: contrib/Makefile.am
===================================================================
--- contrib/Makefile.am.orig
+++ contrib/Makefile.am
@@ -1,22 +1,22 @@
-ganglia_docdir = $(datadir)/doc/$(PACKAGE)/contrib/ganglia
+ganglia_docdir = $(docdir)/contrib/ganglia
ganglia_doc_DATA = \
ganglia/README \
ganglia/ganglia_ipmi_sensors.pl
-libipmimonitoring_docdir = $(datadir)/doc/$(PACKAGE)/contrib/libipmimonitoring
+libipmimonitoring_docdir = $(docdir)/contrib/libipmimonitoring
libipmimonitoring_doc_DATA = \
libipmimonitoring/ipmimonitoring-sel.c \
libipmimonitoring/ipmimonitoring-sensors.c
-nagios_docdir = $(datadir)/doc/$(PACKAGE)/contrib/nagios
+nagios_docdir = $(docdir)/contrib/nagios
nagios_doc_DATA = \
nagios/README \
nagios/nagios_ipmi_sensors.pl
-pet_docdir = $(datadir)/doc/$(PACKAGE)/contrib/pet
+pet_docdir = $(docdir)/contrib/pet
pet_doc_DATA = \
pet/README \
Index: Makefile.am
===================================================================
--- Makefile.am.orig
+++ Makefile.am
@@ -79,7 +79,6 @@ EXTRA = \
DISCLAIMER.ipmidetect.UC \
DISCLAIMER.ipmi-fru.UC
-docdir = $(datadir)/doc/$(PACKAGE)
doc_DATA = $(EXTRA)
CLEANFILES =
Index: doc/Makefile.am
===================================================================
--- doc/Makefile.am.orig
+++ doc/Makefile.am
@@ -13,8 +13,6 @@ EXTRA_DIST = \
freeipmi-bugs-issues-and-workarounds.txt \
freeipmi-oem-documentation-requirements.txt
-docdir = $(datadir)/doc/$(PACKAGE)
-
doc_DATA = $(EXTRA_DIST)