conf: Install strongswan.conf template from a separate directory

2014-01-23 14:38:03 +01:00 · 2014-01-23 14:38:03 +01:00 · c75acc4c44
parent 9925eeabd2
commit c75acc4c44
5 changed files with 7 additions and 7 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -1,4 +1,4 @@
-SUBDIRS = src man init testing
+SUBDIRS = src man conf init testing

 if USE_SCRIPTS
  SUBDIRS += scripts
--- a/conf/Makefile.am
+++ b/conf/Makefile.am
@ -0,0 +1,5 @@
+EXTRA_DIST = strongswan.conf
+
+install-exec-local :
+		test -e "$(DESTDIR)${sysconfdir}" || $(INSTALL) -d "$(DESTDIR)$(sysconfdir)"
+		test -e "$(DESTDIR)$(sysconfdir)/strongswan.conf" || $(INSTALL) -m 640 $(srcdir)/strongswan.conf $(DESTDIR)$(sysconfdir)/strongswan.conf || true
--- a/conf/strongswan.conf
+++ b/conf/strongswan.conf
--- a/configure.ac
+++ b/configure.ac
@ -1368,6 +1368,7 @@ fi

 AC_CONFIG_FILES([
 	Makefile
+	conf/Makefile
 	man/Makefile
 	init/Makefile
 	init/systemd/Makefile
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -119,9 +119,3 @@ endif
 if USE_INTEGRITY_TEST
  SUBDIRS += checksum
 endif
-
-EXTRA_DIST = strongswan.conf
-
-install-exec-local :
-		test -e "$(DESTDIR)${sysconfdir}" || $(INSTALL) -d "$(DESTDIR)$(sysconfdir)"
-		test -e "$(DESTDIR)$(sysconfdir)/strongswan.conf" || $(INSTALL) -m 640 $(srcdir)/strongswan.conf $(DESTDIR)$(sysconfdir)/strongswan.conf || true