From: Martin Willi <martin@strongswan.org>
Date: Fri, 22 Feb 2008 14:50:38 +0000 (-0000)
Subject: creating sysconfdir if it does not exist
X-Git-Tag: 4.2.0~155
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e633b1998fcafdc19d2b0630053af8227d704dfa;p=thirdparty%2Fstrongswan.git

creating sysconfdir if it does not exist
moved all directory creations into starters Makefile
---

diff --git a/src/Makefile.am b/src/Makefile.am
index e01ad84b4b..4c8ed7d7eb 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 40725a996e..fe903bc400 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
+