aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Willi <martin@strongswan.org>2008-02-22 14:50:38 +0000
committerMartin Willi <martin@strongswan.org>2008-02-22 14:50:38 +0000
commite633b1998fcafdc19d2b0630053af8227d704dfa (patch)
tree719c6ba7f3be3ca815927911ee30ffdf0e585c90 /src
parenta11ea97db8a1e9c399b4a16b21c53fb2ac180467 (diff)
downloadstrongswan-e633b1998fcafdc19d2b0630053af8227d704dfa.tar.bz2
strongswan-e633b1998fcafdc19d2b0630053af8227d704dfa.tar.xz
creating sysconfdir if it does not exist
moved all directory creations into starters Makefile
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am13
-rw-r--r--src/starter/Makefile.am15
2 files changed, 13 insertions, 15 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index e01ad84b4..4c8ed7d7e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -35,16 +35,3 @@ if USE_MANAGER
SUBDIRS += manager
endif
-if USE_FILE_CONFIG
-install-exec-local :
- mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d
- mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/cacerts
- mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/ocspcerts
- mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/certs
- mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/acerts
- mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/aacerts
- mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/crls
- mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/reqs
- mkdir -p -m 700 $(DESTDIR)$(confdir)/ipsec.d/private
-endif
-
diff --git a/src/starter/Makefile.am b/src/starter/Makefile.am
index 40725a996..fe903bc40 100644
--- a/src/starter/Makefile.am
+++ b/src/starter/Makefile.am
@@ -30,5 +30,16 @@ keywords.c: keywords.txt keywords.h
defs.o: $(PLUTODIR)/defs.c $(PLUTODIR)/defs.h
$(COMPILE) -c -o $@ $<
-install-exec-local :
- test -e "$(DESTDIR)$(sysconfdir)/ipsec.conf" || $(INSTALL) ipsec.conf $(DESTDIR)$(sysconfdir)/ipsec.conf
+install-exec-local :
+ test -e "$(DESTDIR)${sysconfdir}" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
+ test -e "$(DESTDIR)${sysconfdir}/ipsec.d" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)/ipsec.d"
+ test -e "$(DESTDIR)${sysconfdir}/ipsec.d/cacerts" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)/ipsec.d/cacerts"
+ test -e "$(DESTDIR)${sysconfdir}/ipsec.d/ocspcerts" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)/ipsec.d/ocspcerts"
+ test -e "$(DESTDIR)${sysconfdir}/ipsec.d/certs" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)/ipsec.d/certs"
+ test -e "$(DESTDIR)${sysconfdir}/ipsec.d/acerts" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)/ipsec.d/acerts"
+ test -e "$(DESTDIR)${sysconfdir}/ipsec.d/aacerts" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)/ipsec.d/aacerts"
+ test -e "$(DESTDIR)${sysconfdir}/ipsec.d/crls" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)/ipsec.d/crls"
+ test -e "$(DESTDIR)${sysconfdir}/ipsec.d/reqs" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)/ipsec.d/reqs"
+ test -e "$(DESTDIR)${sysconfdir}/ipsec.d/private" || $(MKDIR_P) -m 700 "$(DESTDIR)$(sysconfdir)/ipsec.d/private"
+ test -e "$(DESTDIR)$(sysconfdir)/ipsec.conf" || $(INSTALL) -m 644 ipsec.conf $(DESTDIR)$(sysconfdir)/ipsec.conf
+