diff options
| author | Alan Conway <aconway@apache.org> | 2008-02-06 22:49:10 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2008-02-06 22:49:10 +0000 |
| commit | 52faea872170225ac1a5441202ad7f35f88c3c77 (patch) | |
| tree | 29a46e1acd2436124da3e574209f3ef6f726ed0b /cpp/src/Makefile.am | |
| parent | 16b2214415090d952d6b8f57a34b03162e9e27b1 (diff) | |
| download | qpid-python-52faea872170225ac1a5441202ad7f35f88c3c77.tar.gz | |
From Ted Ross, https://issues.apache.org/jira/browse/QPID-780
Implementation of --data-dir for qpidd.
Additions by myself:
- set QPID_DATA_DIR= in test env so existing tests can run with no data dir.
- src/Makefile.am and qpidc.spec.in install /var/lib/qpidd directory.
NOTE: qpidd with no optoins will now FAIL if it cannot write /var/lib/qpidd.
Start it with --data-dir= or set QPID_DATA_DIR= in your environement to
run with no data directory.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@619200 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/Makefile.am')
| -rw-r--r-- | cpp/src/Makefile.am | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am index 57a0761935..d2242c2695 100644 --- a/cpp/src/Makefile.am +++ b/cpp/src/Makefile.am @@ -140,6 +140,7 @@ libqpidcommon_la_SOURCES = \ qpid/sys/SystemInfo.cpp \ qpid/sys/Serializer.cpp \ qpid/sys/Shlib.cpp \ + qpid/DataDir.cpp \ qpid/Options.cpp \ qpid/log/Options.cpp \ qpid/log/Selector.cpp \ @@ -236,6 +237,7 @@ libqpidclient_la_SOURCES = \ nobase_include_HEADERS = \ $(platform_hdr) \ qpid/assert.h \ + qpid/DataDir.h \ qpid/Exception.h \ qpid/Msg.h \ qpid/Options.h \ @@ -438,3 +440,7 @@ nobase_include_HEADERS = \ dist-hook: $(BUILT_SOURCES) $(MAKE) qpidd +# Create the default data directory +install-data-local: + $(mkinstalldirs) $(DESTDIR)/$(localstatedir)/lib/qpidd + |