summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/Makefile.am
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2008-02-06 22:49:10 +0000
committerAlan Conway <aconway@apache.org>2008-02-06 22:49:10 +0000
commitbe4e585a15165ee3aad981675a7da172979953de (patch)
treebb41f47c865f381970977490d1813047d388f066 /qpid/cpp/src/Makefile.am
parent197016f29134b32dee1bf0e2770359b38706d23f (diff)
downloadqpid-python-be4e585a15165ee3aad981675a7da172979953de.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@619200 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/Makefile.am')
-rw-r--r--qpid/cpp/src/Makefile.am6
1 files changed, 6 insertions, 0 deletions
diff --git a/qpid/cpp/src/Makefile.am b/qpid/cpp/src/Makefile.am
index 57a0761935..d2242c2695 100644
--- a/qpid/cpp/src/Makefile.am
+++ b/qpid/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
+