Don't fail to install if sysconfdir isn't writable

diff --git a/conf/Makefile.am b/conf/Makefile.am
index 08613708ce04b5535a21247709c5a93ee25a8831..ee9ce72eaf018fe61c1ebb8f42233a6e1d40cfb3 100644 (file)
--- a/conf/Makefile.am
+++ b/conf/Makefile.am
@@ -153,9 +153,9 @@ maintainer-clean-local:
                rm -f $(confsnippets) default.conf plugins/*.conf plugins/*.tmp
 
 install-data-local: $(plugins_install_src)
-       test -e "$(DESTDIR)${strongswanconfdir}" || $(INSTALL) -d "$(DESTDIR)$(strongswanconfdir)"
-       test -e "$(DESTDIR)${strongswanddir}" || $(INSTALL) -d "$(DESTDIR)$(strongswanddir)"
-       test -e "$(DESTDIR)${charonconfdir}" || $(INSTALL) -d "$(DESTDIR)$(charonconfdir)"
+       test -e "$(DESTDIR)${strongswanconfdir}" || $(INSTALL) -d "$(DESTDIR)$(strongswanconfdir)" || true
+       test -e "$(DESTDIR)${strongswanddir}" || $(INSTALL) -d "$(DESTDIR)$(strongswanddir)" || true
+       test -e "$(DESTDIR)${charonconfdir}" || $(INSTALL) -d "$(DESTDIR)$(charonconfdir)" || true
        test -e "$(DESTDIR)$(strongswanconfdir)/strongswan.conf" || $(INSTALL) -m 644 $(srcdir)/strongswan.conf $(DESTDIR)$(strongswanconfdir)/strongswan.conf || true
        for f in $(options_install_src); do \
                name=`basename $$f`; \

diff --git a/src/swanctl/Makefile.am b/src/swanctl/Makefile.am
index dec7d62edf7fee871965ca196d8f760706a77afe..482688c977eccaf6f87a0aa30c914c766bc495f4 100644 (file)
--- a/src/swanctl/Makefile.am
+++ b/src/swanctl/Makefile.am
@@ -56,7 +56,7 @@ maintainer-clean-local:
        cd $(srcdir) && rm -f swanctl.conf swanctl.conf.5.main
 
 install-data-local: swanctl.conf
-       test -e "$(DESTDIR)$(swanctldir)" || $(INSTALL) -d "$(DESTDIR)$(swanctldir)"
+       test -e "$(DESTDIR)$(swanctldir)" || $(INSTALL) -d "$(DESTDIR)$(swanctldir)" || true
        test -e "$(DESTDIR)$(swanctldir)/x509" || $(INSTALL) -d "$(DESTDIR)$(swanctldir)/x509" || true
        test -e "$(DESTDIR)$(swanctldir)/x509ca" || $(INSTALL) -d "$(DESTDIR)$(swanctldir)/x509ca" || true
        test -e "$(DESTDIR)$(swanctldir)/x509aa" || $(INSTALL) -d "$(DESTDIR)$(swanctldir)/x509aa" || true