5 files changed, 46 insertions, 3 deletions
diff --git a/src/exchange/Makefile.am b/src/exchange/Makefile.am
index a7e175929..68689da22 100644
--- a/src/exchange/Makefile.am
+++ b/src/exchange/Makefile.am
@@ -6,6 +6,11 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+pkgcfg_DATA = \
+  exchange.conf
+
 bin_PROGRAMS = \
   taler-exchange-aggregator \
   taler-exchange-httpd
diff --git a/src/exchange/exchange.conf b/src/exchange/exchange.conf
new file mode 100644
index 000000000..6a4f03ac1
--- /dev/null
+++ b/src/exchange/exchange.conf
@@ -0,0 +1,38 @@
+[exchange]
+# Currency supported by the exchange (can only be one)
+# CURRENCY = EUR
+
+# Wire format supported by the exchange We use 'test' for testing of
+# the actual coin operations.
+WIREFORMAT = test
+
+# HTTP port the exchange listens to
+PORT = 8081
+
+# Master public key used to sign the exchange's various keys
+# MASTER_PUBLIC_KEY = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
+
+# How to access our database
+DB = postgres
+
+# Is this is a testcase, use transient DB actions?
+# TESTRUN = YES
+
+[exchangedb-postgres]
+DB_CONN_STR = "postgres:///taler"
+
+
+[wire-incoming-test]
+# What is the main website of the bank?
+BANK_URI = "http://localhost:8082/"
+# Into which account at the 'bank' should incoming
+# wire transfers be made?
+BANK_ACCOUNT_NUMBER = 2
+
+[wire-outgoing-test]
+# What is the main website of the bank?
+BANK_URI = "http://localhost:8082/"
+
+# From which account at the 'bank' should outgoing
+# wire transfers be made?
+BANK_ACCOUNT_NUMBER = 3
diff --git a/src/exchangedb/Makefile.am b/src/exchangedb/Makefile.am
index 0a7b0447c..914153f6f 100644
--- a/src/exchangedb/Makefile.am
+++ b/src/exchangedb/Makefile.am
@@ -6,7 +6,7 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
-plugindir = $(libdir)/taler
+plugindir = $(libdir)/taler-exchange
 
 if HAVE_POSTGRESQL
 plugin_LTLIBRARIES = \
diff --git a/src/util/os_installation.c b/src/util/os_installation.c
index 4fce72ee9..22e0133cd 100644
--- a/src/util/os_installation.c
+++ b/src/util/os_installation.c
@@ -33,7 +33,7 @@
  */
 static const struct GNUNET_OS_ProjectData taler_pd = {
   .libname = "libtalerutil",
-  .project_dirname = "taler",
+  .project_dirname = "taler-exchange",
   .binary_name = "taler-exchange-httpd",
   .env_varname = "TALER_PREFIX"
 };
diff --git a/src/wire/Makefile.am b/src/wire/Makefile.am
index fd59c8eb7..16ef1ded0 100644
--- a/src/wire/Makefile.am
+++ b/src/wire/Makefile.am
@@ -6,7 +6,7 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
-plugindir = $(libdir)/taler
+plugindir = $(libdir)/taler-exchange
 
 plugin_LTLIBRARIES = \
   libtaler_plugin_wire_sepa.la \