diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2014-01-23 14:38:03 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2014-02-12 14:34:33 +0100 |
| commit | c75acc4c44af5f6fb03b7402dbf72d6f10443315 (patch) | |
| tree | 2009077541ff650a6b2b46e539807c03594e4189 | |
| parent | 9925eeabd2a617cb45d0f0a2f1b3605f763ffd2c (diff) | |
| download | strongswan-c75acc4c44af5f6fb03b7402dbf72d6f10443315.tar.bz2 strongswan-c75acc4c44af5f6fb03b7402dbf72d6f10443315.tar.xz | |
conf: Install strongswan.conf template from a separate directory
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | conf/Makefile.am | 5 | ||||
| -rw-r--r-- | conf/strongswan.conf (renamed from src/strongswan.conf) | 0 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 6 |
5 files changed, 7 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 687d896f6..be320188a 100644 --- 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 diff --git a/conf/Makefile.am b/conf/Makefile.am new file mode 100644 index 000000000..cbbb5b57e --- /dev/null +++ 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 diff --git a/src/strongswan.conf b/conf/strongswan.conf index 0d82dedfa..0d82dedfa 100644 --- a/src/strongswan.conf +++ b/conf/strongswan.conf diff --git a/configure.ac b/configure.ac index 76981e7b4..2eba4d5ca 100644 --- a/configure.ac +++ b/configure.ac @@ -1368,6 +1368,7 @@ fi AC_CONFIG_FILES([ Makefile + conf/Makefile man/Makefile init/Makefile init/systemd/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index f290d9c85..7d11893d1 100644 --- 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 |