| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 1 | firewalld: fix building in a separate directory outside the source tree |
| 2 | |
| 3 | Upstream-Status: Submitted [https://github.com/firewalld/firewalld/pull/456] |
| 4 | Signed-off-by: Dan Callaghan <dan.callaghan@opengear.com> |
| 5 | |
| 6 | diff --git a/config/Makefile.am b/config/Makefile.am |
| 7 | index 7048d2ee..5270d408 100644 |
| 8 | --- a/config/Makefile.am |
| 9 | +++ b/config/Makefile.am |
| 10 | @@ -377,11 +377,11 @@ install-config: |
| 11 | $(MKDIR_P) $(DESTDIR)$(sconfdir)/zones |
| 12 | $(MKDIR_P) $(DESTDIR)$(sconfdir)/helpers |
| 13 | $(MKDIR_P) $(DESTDIR)$(prefixlibdir) |
| 14 | - cp -r icmptypes $(DESTDIR)$(prefixlibdir) |
| 15 | - cp -r ipsets $(DESTDIR)$(prefixlibdir) |
| 16 | - cp -r services $(DESTDIR)$(prefixlibdir) |
| 17 | - cp -r zones $(DESTDIR)$(prefixlibdir) |
| 18 | - cp -r helpers $(DESTDIR)$(prefixlibdir) |
| 19 | + cp -r $(srcdir)/icmptypes $(DESTDIR)$(prefixlibdir) |
| 20 | + cp -r $(srcdir)/ipsets $(DESTDIR)$(prefixlibdir) |
| 21 | + cp -r $(srcdir)/services $(DESTDIR)$(prefixlibdir) |
| 22 | + cp -r $(srcdir)/zones $(DESTDIR)$(prefixlibdir) |
| 23 | + cp -r $(srcdir)/helpers $(DESTDIR)$(prefixlibdir) |
| 24 | |
| 25 | uninstall-config: |
| 26 | rmdir $(DESTDIR)$(sconfdir)/icmptypes |
| 27 | diff --git a/doc/xml/Makefile.am b/doc/xml/Makefile.am |
| 28 | index 8c93ab9c..d0313e3e 100644 |
| 29 | --- a/doc/xml/Makefile.am |
| 30 | +++ b/doc/xml/Makefile.am |
| 31 | @@ -69,7 +69,8 @@ edit = sed \ |
| 32 | -e 's|\@PREFIX\@|$(prefix)|' \ |
| 33 | -e 's|\@SYSCONFDIR\@|$(sysconfdir)|' \ |
| 34 | -e 's|\@PACKAGE_STRING\@|$(PACKAGE_STRING)|' \ |
| 35 | - -e 's|\@IFCFGDIR\@|$(IFCFGDIR)|' |
| 36 | + -e 's|\@IFCFGDIR\@|$(IFCFGDIR)|' \ |
| 37 | + -e 's|@SRCDIR@|$(srcdir)|' |
| 38 | |
| 39 | transform-man.xsl: transform-man.xsl.in |
| 40 | $(edit) $< >$@ |
| 41 | diff --git a/doc/xml/firewall-cmd.xml.in b/doc/xml/firewall-cmd.xml.in |
| 42 | index c2606553..24d77858 100644 |
| 43 | --- a/doc/xml/firewall-cmd.xml.in |
| 44 | +++ b/doc/xml/firewall-cmd.xml.in |
| 45 | @@ -1,9 +1,9 @@ |
| 46 | <?xml version="1.0" encoding="utf-8"?> |
| 47 | <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" |
| 48 | [ |
| 49 | -<!ENTITY authors SYSTEM "authors.xml"> |
| 50 | -<!ENTITY seealso SYSTEM "seealso.xml"> |
| 51 | -<!ENTITY notes SYSTEM "notes.xml"> |
| 52 | +<!ENTITY authors SYSTEM "@SRCDIR@/authors.xml"> |
| 53 | +<!ENTITY seealso SYSTEM "@SRCDIR@/seealso.xml"> |
| 54 | +<!ENTITY notes SYSTEM "@SRCDIR@/notes.xml"> |
| 55 | <!ENTITY errorcodes SYSTEM "errorcodes.xml"> |
| 56 | ]> |
| 57 | |
| 58 | diff --git a/doc/xml/firewalld.xml.in b/doc/xml/firewalld.xml.in |
| 59 | index de802059..3d319b04 100644 |
| 60 | --- a/doc/xml/firewalld.xml.in |
| 61 | +++ b/doc/xml/firewalld.xml.in |
| 62 | @@ -1,9 +1,9 @@ |
| 63 | <?xml version="1.0" encoding="utf-8"?> |
| 64 | <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" |
| 65 | [ |
| 66 | -<!ENTITY authors SYSTEM "authors.xml"> |
| 67 | -<!ENTITY seealso SYSTEM "seealso.xml"> |
| 68 | -<!ENTITY notes SYSTEM "notes.xml"> |
| 69 | +<!ENTITY authors SYSTEM "@SRCDIR@/authors.xml"> |
| 70 | +<!ENTITY seealso SYSTEM "@SRCDIR@/seealso.xml"> |
| 71 | +<!ENTITY notes SYSTEM "@SRCDIR@/notes.xml"> |
| 72 | ]> |
| 73 | |
| 74 | <!-- |
| 75 | -- |
| 76 | 2.20.1 |
| 77 | |