4 files changed, 6 insertions, 6 deletions
diff --git a/sca-cpp/trunk/modules/java/Makefile.am b/sca-cpp/trunk/modules/java/Makefile.am
index 458a8f977b..5c640ac31b 100644
--- a/sca-cpp/trunk/modules/java/Makefile.am
+++ b/sca-cpp/trunk/modules/java/Makefile.am
@@ -15,8 +15,8 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-libdir = $(prefix)/modules/java
 JAVAROOT = $(top_builddir)/modules/java
+libdir = $(prefix)/modules/java
 
 if WANT_JAVA
 
diff --git a/sca-cpp/trunk/modules/python/Makefile.am b/sca-cpp/trunk/modules/python/Makefile.am
index 55b4b8f7e7..c4e7b038e1 100644
--- a/sca-cpp/trunk/modules/python/Makefile.am
+++ b/sca-cpp/trunk/modules/python/Makefile.am
@@ -15,7 +15,7 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-libdir=$(prefix)/modules/python
+libdir = $(prefix)/modules/python
 
 if WANT_PYTHON
 
@@ -28,7 +28,7 @@ nobase_xsd_DATA = *.xsd
 xsddir = $(prefix)/xsd
 
 prefix_DATA = python.prefix
-prefixdir=$(prefix)/modules/python
+prefixdir = $(prefix)/modules/python
 python.prefix: $(top_builddir)/config.status
 	echo ${PYTHON_PREFIX} >python.prefix
 
diff --git a/sca-cpp/trunk/modules/server/Makefile.am b/sca-cpp/trunk/modules/server/Makefile.am
index 39135d2212..06323aad05 100644
--- a/sca-cpp/trunk/modules/server/Makefile.am
+++ b/sca-cpp/trunk/modules/server/Makefile.am
@@ -21,7 +21,7 @@ mod_SCRIPTS = cpp-conf scheme-conf server-conf
 moddir = $(prefix)/modules/server
 
 lib_LTLIBRARIES = libmod_tuscany_eval.la libmod_tuscany_wiring.la
-libdir=$(prefix)/modules/server
+libdir = $(prefix)/modules/server
 noinst_DATA = libmod_tuscany_eval.so libmod_tuscany_wiring.so
 
 libmod_tuscany_eval_la_SOURCES = mod-eval.cpp
diff --git a/sca-cpp/trunk/test/store-java/Makefile.am b/sca-cpp/trunk/test/store-java/Makefile.am
index d4f161fd50..80972a0acc 100644
--- a/sca-cpp/trunk/test/store-java/Makefile.am
+++ b/sca-cpp/trunk/test/store-java/Makefile.am
@@ -15,12 +15,12 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
+JAVAROOT = ${top_builddir}/test/store-java
+
 if WANT_JAVA
 
 AM_JAVACFLAGS = -cp ${top_builddir}/modules/java/libmod-tuscany-java-${PACKAGE_VERSION}.jar:${JAVAROOT}
 
-JAVAROOT = ${top_builddir}/test/store-java
-
 noinst_JAVA = store/*.java
 
 CLEANFILES = store/*.class