diff options
| author | Kim van der Riet <kpvdr@apache.org> | 2012-08-03 12:13:32 +0000 |
|---|---|---|
| committer | Kim van der Riet <kpvdr@apache.org> | 2012-08-03 12:13:32 +0000 |
| commit | d43d1912b376322e27fdcda551a73f9ff5487972 (patch) | |
| tree | ce493e10baa95f44be8beb5778ce51783463196d /cpp/etc | |
| parent | 04877fec0c6346edec67072d7f2d247740cf2af5 (diff) | |
| download | qpid-python-d43d1912b376322e27fdcda551a73f9ff5487972.tar.gz | |
QPID-3858: Updated branch - merged from trunk r.1368650
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1368910 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/etc')
| -rw-r--r-- | cpp/etc/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/etc/Makefile.am b/cpp/etc/Makefile.am index b154a105d4..aa41c65b37 100644 --- a/cpp/etc/Makefile.am +++ b/cpp/etc/Makefile.am @@ -20,8 +20,8 @@ SASL_CONF = sasl2/qpidd.conf EXTRA_DIST = \ $(SASL_CONF) \ - qpidd qpidd-primary qpidd.conf qpidc.conf CMakeLists.txt \ - cluster.conf-example.xml + qpidd.in qpidd-primary.in qpidd.conf qpidc.conf CMakeLists.txt \ + cluster.conf-example.xml.in confdir = $(sysconfdir)/qpid nobase_conf_DATA=\ |