Fixed installation of config files in out-of-tree builds.
authorTobias Brunner <tobias@strongswan.org>
Mon, 20 Jul 2009 19:13:45 +0000 (21:13 +0200)
committerTobias Brunner <tobias@strongswan.org>
Mon, 20 Jul 2009 19:13:45 +0000 (21:13 +0200)
src/Makefile.am
src/starter/Makefile.am

index 9eacf5e..ebdaa6a 100644 (file)
@@ -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
index aa48738..ed5b0f1 100644 (file)
@@ -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