Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / openbmc / 26bdd44576f25d63bf32632369b0cbdd94c93d7a / . / meta-openembedded / meta-networking / recipes-connectivity / firewalld / files / 0001-fix-building-in-a-separate-directory-outside-the-sou.patch
blob: 28d590242912614de7018ee4fc0c5cd6f105d239 [file] [log] [blame]
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]1firewalld: fix building in a separate directory outside the source tree
2
Brad Bishop26bdd442019-08-16 17:08:17 -0400[diff] [blame^]3Upstream-Status: Accepted [https://github.com/firewalld/firewalld/pull/456]
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]4Signed-off-by: Dan Callaghan <dan.callaghan@opengear.com>
5
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]6--- a/config/Makefile.am
7+++ b/config/Makefile.am
8@@ -377,11 +377,11 @@ install-config:
9 $(MKDIR_P) $(DESTDIR)$(sconfdir)/zones
10 $(MKDIR_P) $(DESTDIR)$(sconfdir)/helpers
11 $(MKDIR_P) $(DESTDIR)$(prefixlibdir)
12- cp -r icmptypes $(DESTDIR)$(prefixlibdir)
13- cp -r ipsets $(DESTDIR)$(prefixlibdir)
14- cp -r services $(DESTDIR)$(prefixlibdir)
15- cp -r zones $(DESTDIR)$(prefixlibdir)
16- cp -r helpers $(DESTDIR)$(prefixlibdir)
17+ cp -r $(srcdir)/icmptypes $(DESTDIR)$(prefixlibdir)
18+ cp -r $(srcdir)/ipsets $(DESTDIR)$(prefixlibdir)
19+ cp -r $(srcdir)/services $(DESTDIR)$(prefixlibdir)
20+ cp -r $(srcdir)/zones $(DESTDIR)$(prefixlibdir)
21+ cp -r $(srcdir)/helpers $(DESTDIR)$(prefixlibdir)
22
23 uninstall-config:
24 rmdir $(DESTDIR)$(sconfdir)/icmptypes
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]25--- a/doc/xml/Makefile.am
26+++ b/doc/xml/Makefile.am
27@@ -69,7 +69,8 @@ edit = sed \
28 -e 's|\@PREFIX\@|$(prefix)|' \
29 -e 's|\@SYSCONFDIR\@|$(sysconfdir)|' \
30 -e 's|\@PACKAGE_STRING\@|$(PACKAGE_STRING)|' \
31- -e 's|\@IFCFGDIR\@|$(IFCFGDIR)|'
32+ -e 's|\@IFCFGDIR\@|$(IFCFGDIR)|' \
33+ -e 's|@SRCDIR@|$(srcdir)|'
34
35 transform-man.xsl: transform-man.xsl.in
36 $(edit) $< >$@
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]37--- a/doc/xml/firewall-cmd.xml.in
38+++ b/doc/xml/firewall-cmd.xml.in
Brad Bishop26bdd442019-08-16 17:08:17 -0400[diff] [blame^]39@@ -1,10 +1,10 @@
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]40 <?xml version="1.0" encoding="utf-8"?>
41 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
42 [
43-<!ENTITY authors SYSTEM "authors.xml">
44-<!ENTITY seealso SYSTEM "seealso.xml">
45-<!ENTITY notes SYSTEM "notes.xml">
Brad Bishop26bdd442019-08-16 17:08:17 -0400[diff] [blame^]46-<!ENTITY errorcodes SYSTEM "errorcodes.xml">
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]47+<!ENTITY authors SYSTEM "@SRCDIR@/authors.xml">
48+<!ENTITY seealso SYSTEM "@SRCDIR@/seealso.xml">
49+<!ENTITY notes SYSTEM "@SRCDIR@/notes.xml">
Brad Bishop26bdd442019-08-16 17:08:17 -0400[diff] [blame^]50+<!ENTITY errorcodes SYSTEM "@SRCDIR@/errorcodes.xml">
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]51 ]>
52
Brad Bishop26bdd442019-08-16 17:08:17 -0400[diff] [blame^]53 <!--
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]54--- a/doc/xml/firewalld.xml.in
55+++ b/doc/xml/firewalld.xml.in
56@@ -1,9 +1,9 @@
57 <?xml version="1.0" encoding="utf-8"?>
58 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
59 [
60-<!ENTITY authors SYSTEM "authors.xml">
61-<!ENTITY seealso SYSTEM "seealso.xml">
62-<!ENTITY notes SYSTEM "notes.xml">
63+<!ENTITY authors SYSTEM "@SRCDIR@/authors.xml">
64+<!ENTITY seealso SYSTEM "@SRCDIR@/seealso.xml">
65+<!ENTITY notes SYSTEM "@SRCDIR@/notes.xml">
66 ]>
67
68 <!--