aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2009-07-20 21:13:45 +0200
committerTobias Brunner <tobias@strongswan.org>2009-07-20 21:13:45 +0200
commit9af7715c3ddaa91a30c390cff5576cb29c2f241a (patch)
tree30b8b3961568da4b28dfdbe5616eadc6c5238f92
parent7cdf712d3e22c68aa7945b6b037059221339f3f2 (diff)
downloadstrongswan-9af7715c3ddaa91a30c390cff5576cb29c2f241a.tar.bz2
strongswan-9af7715c3ddaa91a30c390cff5576cb29c2f241a.tar.xz
Fixed installation of config files in out-of-tree builds.
-rw-r--r--src/Makefile.am2
-rw-r--r--src/starter/Makefile.am2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 9eacf5ef5..ebdaa6a63 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,4 +52,4 @@ EXTRA_DIST = strongswan.conf
install-exec-local :
test -e "$(DESTDIR)${sysconfdir}" || $(INSTALL) -d "$(DESTDIR)$(sysconfdir)"
- test -e "$(DESTDIR)$(sysconfdir)/strongswan.conf" || $(INSTALL) -o ${ipsecuid} -g ${ipsecgid} -m 640 strongswan.conf $(DESTDIR)$(sysconfdir)/strongswan.conf || true
+ test -e "$(DESTDIR)$(sysconfdir)/strongswan.conf" || $(INSTALL) -o ${ipsecuid} -g ${ipsecgid} -m 640 $(srcdir)/strongswan.conf $(DESTDIR)$(sysconfdir)/strongswan.conf || true
diff --git a/src/starter/Makefile.am b/src/starter/Makefile.am
index aa487386a..ed5b0f10d 100644
--- a/src/starter/Makefile.am
+++ b/src/starter/Makefile.am
@@ -61,5 +61,5 @@ install-exec-local :
test -e "$(DESTDIR)${sysconfdir}/ipsec.d/crls" || $(INSTALL) -o ${ipsecuid} -g ${ipsecgid} -d "$(DESTDIR)$(sysconfdir)/ipsec.d/crls" || true
test -e "$(DESTDIR)${sysconfdir}/ipsec.d/reqs" || $(INSTALL) -o ${ipsecuid} -g ${ipsecgid} -d "$(DESTDIR)$(sysconfdir)/ipsec.d/reqs" || true
test -e "$(DESTDIR)${sysconfdir}/ipsec.d/private" || $(INSTALL) -o ${ipsecuid} -g ${ipsecgid} -d -m 750 "$(DESTDIR)$(sysconfdir)/ipsec.d/private" || true
- test -e "$(DESTDIR)$(sysconfdir)/ipsec.conf" || $(INSTALL) -o ${ipsecuid} -g ${ipsecgid} -m 644 ipsec.conf $(DESTDIR)$(sysconfdir)/ipsec.conf || true
+ test -e "$(DESTDIR)$(sysconfdir)/ipsec.conf" || $(INSTALL) -o ${ipsecuid} -g ${ipsecgid} -m 644 $(srcdir)/ipsec.conf $(DESTDIR)$(sysconfdir)/ipsec.conf || true