Index: /branches/eam_branches/eam_branch_20090303/ppArith/src/Makefile.am
===================================================================
--- /branches/eam_branches/eam_branch_20090303/ppArith/src/Makefile.am	(revision 23201)
+++ /branches/eam_branches/eam_branch_20090303/ppArith/src/Makefile.am	(revision 23202)
@@ -1,14 +1,14 @@
 bin_PROGRAMS = ppArith
 
-PPARITH_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
-PPARITH_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else svn info | sed -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'; fi`
-PPARITH_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
+# PPARITH_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
+# PPARITH_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else svn info | sed -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'; fi`
+# PPARITH_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
+# 
+# # Force recompilation of ppArithVersion.c, since it gets the version information
+# ppArithVersion.c: FORCE
+# 	touch ppArith.c
+# FORCE: ;
 
-# Force recompilation of ppArithVersion.c, since it gets the version information
-ppArithVersion.c: FORCE
-	touch ppArith.c
-FORCE: ;
-
-ppArith_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PPSTATS_CFLAGS) $(PSPHOT_CFLAGS) $(PPARITH_CFLAGS) -DPPARITH_VERSION=\"$(PPARITH_VERSION)\" -DPPARITH_BRANCH=\"$(PPARITH_BRANCH)\" -DPPARITH_SOURCE=\"$(PPARITH_SOURCE)\"
+ppArith_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PPSTATS_CFLAGS) $(PSPHOT_CFLAGS) $(PPARITH_CFLAGS) -DPPARITH_VERSION=$(SVN_VERSION) -DPPARITH_BRANCH=$(SVN_BRANCH) -DPPARITH_SOURCE=$(SVN_SOURCE)
 ppArith_LDFLAGS  = $(PSLIB_LIBS)   $(PSMODULE_LIBS)   $(PPSTATS_LIBS)   $(PSPHOT_LIBS)   $(PPARITH_LIBS)
 
Index: /branches/eam_branches/eam_branch_20090303/ppArith/src/ppArithVersion.c
===================================================================
--- /branches/eam_branches/eam_branch_20090303/ppArith/src/ppArithVersion.c	(revision 23201)
+++ /branches/eam_branches/eam_branch_20090303/ppArith/src/ppArithVersion.c	(revision 23202)
@@ -22,6 +22,4 @@
 #include "ppArith.h"
 
-psString ppArithVersion(void)
-{
 #ifndef PPARITH_VERSION
 #error "PPARITH_VERSION is not set"
@@ -30,13 +28,21 @@
 #error "PPARITH_BRANCH is not set"
 #endif
-    return psStringCopy(PPARITH_BRANCH "@" PPARITH_VERSION);
+#ifndef PPARITH_SOURCE
+#error "PPARITH_SOURCE is not set"
+#endif
+
+#define xstr(s) str(s)
+#define str(s) #s
+
+psString ppArithVersion(void)
+{
+    char *value = NULL;
+    psStringAppend(&value, "%s@%s", xstr(PPARITH_BRANCH), xstr(PPARITH_VERSION));
+    return value;
 }
 
 psString ppArithSource(void)
 {
-#ifndef PPARITH_SOURCE
-#error "PPARITH_SOURCE is not set"
-#endif
-    return psStringCopy(PPARITH_SOURCE);
+    return psStringCopy(xstr(PPARITH_SOURCE));
 }
 
Index: /branches/eam_branches/eam_branch_20090303/ppMerge/src/Makefile.am
===================================================================
--- /branches/eam_branches/eam_branch_20090303/ppMerge/src/Makefile.am	(revision 23201)
+++ /branches/eam_branches/eam_branch_20090303/ppMerge/src/Makefile.am	(revision 23202)
@@ -1,14 +1,14 @@
 bin_PROGRAMS = ppMerge
 
-PPMERGE_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
-PPMERGE_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else svn info | sed -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'; fi`
-PPMERGE_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
+# PPMERGE_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
+# PPMERGE_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else svn info | sed -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'; fi`
+# PPMERGE_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
+# 
+# # Force recompilation of ppMergeVersion.c, since it gets the version information
+# ppMergeVersion.c: FORCE
+# 	touch ppMergeVersion.c
+# FORCE: ;
 
-# Force recompilation of ppMergeVersion.c, since it gets the version information
-ppMergeVersion.c: FORCE
-	touch ppMergeVersion.c
-FORCE: ;
-
-ppMerge_CFLAGS = $(PPMERGE_CFLAGS) $(PPSTATS_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPPMERGE_VERSION=\"$(PPMERGE_VERSION)\" -DPPMERGE_BRANCH=\"$(PPMERGE_BRANCH)\" -DPPMERGE_SOURCE=\"$(PPMERGE_SOURCE)\"
+ppMerge_CFLAGS = $(PPMERGE_CFLAGS) $(PPSTATS_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPPMERGE_VERSION=$(SVN_VERSION) -DPPMERGE_BRANCH=$(SVN_BRANCH) -DPPMERGE_SOURCE=$(SVN_SOURCE)
 ppMerge_LDFLAGS = $(PPMERGE_LIBS) $(PPSTATS_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
 
Index: /branches/eam_branches/eam_branch_20090303/ppMerge/src/ppMergeVersion.c
===================================================================
--- /branches/eam_branches/eam_branch_20090303/ppMerge/src/ppMergeVersion.c	(revision 23201)
+++ /branches/eam_branches/eam_branch_20090303/ppMerge/src/ppMergeVersion.c	(revision 23202)
@@ -22,6 +22,4 @@
 #include "ppMergeVersion.h"
 
-psString ppMergeVersion(void)
-{
 #ifndef PPMERGE_VERSION
 #error "PPMERGE_VERSION is not set"
@@ -30,13 +28,21 @@
 #error "PPMERGE_BRANCH is not set"
 #endif
-    return psStringCopy(PPMERGE_BRANCH "@" PPMERGE_VERSION);
+#ifndef PPMERGE_SOURCE
+#error "PPMERGE_SOURCE is not set"
+#endif
+
+#define xstr(s) str(s)
+#define str(s) #s
+
+psString ppMergeVersion(void)
+{
+    char *value = NULL;
+    psStringAppend(&value, "%s@%s", xstr(PPMERGE_BRANCH), xstr(PPMERGE_VERSION));
+    return value;
 }
 
 psString ppMergeSource(void)
 {
-#ifndef PPMERGE_SOURCE
-#error "PPMERGE_SOURCE is not set"
-#endif
-    return psStringCopy(PPMERGE_SOURCE);
+    return psStringCopy(xstr(PPMERGE_SOURCE));
 }
 
Index: /branches/eam_branches/eam_branch_20090303/ppSim/src/Makefile.am
===================================================================
--- /branches/eam_branches/eam_branch_20090303/ppSim/src/Makefile.am	(revision 23201)
+++ /branches/eam_branches/eam_branch_20090303/ppSim/src/Makefile.am	(revision 23202)
@@ -1,14 +1,14 @@
 bin_PROGRAMS = ppSim ppSimSequence
 
-PPSIM_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
-PPSIM_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else svn info | sed -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'; fi`
-PPSIM_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
+# PPSIM_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
+# PPSIM_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else svn info | sed -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'; fi`
+# PPSIM_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
+# 
+# # Force recompilation of ppSimVersion.c, since it gets the version information
+# ppSimVersion.c: FORCE
+# 	touch ppSimVersion.c
+# FORCE: ;
 
-# Force recompilation of ppSimVersion.c, since it gets the version information
-ppSimVersion.c: FORCE
-	touch ppSimVersion.c
-FORCE: ;
-
-ppSim_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSPHOT_CFLAGS) $(PSASTRO_CFLAGS) $(ppSim_CFLAGS) -DPPSIM_VERSION=\"$(PPSIM_VERSION)\" -DPPSIM_BRANCH=\"$(PPSIM_BRANCH)\" -DPPSIM_SOURCE=\"$(PPSIM_SOURCE)\"
+ppSim_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSPHOT_CFLAGS) $(PSASTRO_CFLAGS) $(ppSim_CFLAGS) -DPPSIM_VERSION=$(SVN_VERSION) -DPPSIM_BRANCH=$(SVN_BRANCH) -DPPSIM_SOURCE=$(SVN_SOURCE)
 ppSim_LDFLAGS = $(PSLIB_LIBS) $(PSMODULE_LIBS) $(PSPHOT_LIBS) $(PSASTRO_LIBS)
 ppSim_SOURCES = \
Index: /branches/eam_branches/eam_branch_20090303/ppSim/src/ppSimVersion.c
===================================================================
--- /branches/eam_branches/eam_branch_20090303/ppSim/src/ppSimVersion.c	(revision 23201)
+++ /branches/eam_branches/eam_branch_20090303/ppSim/src/ppSimVersion.c	(revision 23202)
@@ -1,7 +1,4 @@
 #include "ppSim.h"
 
-
-psString ppSimVersion(void)
-{
 #ifndef PPSIM_VERSION
 #error "PPSIM_VERSION is not set"
@@ -10,13 +7,21 @@
 #error "PPSIM_BRANCH is not set"
 #endif
-    return psStringCopy(PPSIM_BRANCH "@" PPSIM_VERSION);
+#ifndef PPSIM_SOURCE
+#error "PPSIM_SOURCE is not set"
+#endif
+
+#define xstr(s) str(s)
+#define str(s) #s
+
+psString ppSimVersion(void)
+{
+    char *value = NULL;
+    psStringAppend(&value, "%s@%s", xstr(PPSIM_BRANCH), xstr(PPSIM_VERSION));
+    return value;
 }
 
 psString ppSimSource(void)
 {
-#ifndef PPSIM_SOURCE
-#error "PPSIM_SOURCE is not set"
-#endif
-    return psStringCopy(PPSIM_SOURCE);
+    return psStringCopy(xstr(PPSIM_SOURCE));
 }
 
Index: /branches/eam_branches/eam_branch_20090303/ppStack/src/Makefile.am
===================================================================
--- /branches/eam_branches/eam_branch_20090303/ppStack/src/Makefile.am	(revision 23201)
+++ /branches/eam_branches/eam_branch_20090303/ppStack/src/Makefile.am	(revision 23202)
@@ -1,14 +1,14 @@
 bin_PROGRAMS = ppStack
 
-PPSTACK_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
-PPSTACK_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else svn info | sed -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'; fi`
-PPSTACK_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
+# PPSTACK_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
+# PPSTACK_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else svn info | sed -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'; fi`
+# PPSTACK_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
+# 
+# # Force recompilation of ppStackVersion.c, since it gets the version information
+# ppStackVersion.c: FORCE
+# 	touch ppStackVersion.c
+# FORCE: ;
 
-# Force recompilation of ppStackVersion.c, since it gets the version information
-ppStackVersion.c: FORCE
-	touch ppStackVersion.c
-FORCE: ;
-
-ppStack_CFLAGS 	= $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSPHOT_CFLAGS) $(PPSTATS_CFLAGS) $(PPSTACK_CFLAGS) -DPPSTACK_VERSION=\"$(PPSTACK_VERSION)\" -DPPSTACK_BRANCH=\"$(PPSTACK_BRANCH)\" -DPPSTACK_SOURCE=\"$(PPSTACK_SOURCE)\"
+ppStack_CFLAGS 	= $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSPHOT_CFLAGS) $(PPSTATS_CFLAGS) $(PPSTACK_CFLAGS) -DPPSTACK_VERSION=$(SVN_VERSION) -DPPSTACK_BRANCH=$(SVN_BRANCH) -DPPSTACK_SOURCE=$(SVN_SOURCE)
 ppStack_LDFLAGS = $(PSLIB_LIBS)   $(PSMODULE_LIBS)   $(PSPHOT_LIBS)   $(PPSTATS_LIBS)   $(PPSTACK_LIBS)
 
Index: /branches/eam_branches/eam_branch_20090303/ppStack/src/ppStackVersion.c
===================================================================
--- /branches/eam_branches/eam_branch_20090303/ppStack/src/ppStackVersion.c	(revision 23201)
+++ /branches/eam_branches/eam_branch_20090303/ppStack/src/ppStackVersion.c	(revision 23202)
@@ -10,6 +10,4 @@
 #include "ppStack.h"
 
-psString ppStackVersion(void)
-{
 #ifndef PPSTACK_VERSION
 #error "PPSTACK_VERSION is not set"
@@ -18,13 +16,21 @@
 #error "PPSTACK_BRANCH is not set"
 #endif
-    return psStringCopy(PPSTACK_BRANCH "@" PPSTACK_VERSION);
+#ifndef PPSTACK_SOURCE
+#error "PPSTACK_SOURCE is not set"
+#endif
+
+#define xstr(s) str(s)
+#define str(s) #s
+
+psString ppStackVersion(void)
+{
+    char *value = NULL;
+    psStringAppend(&value, "%s@%s", xstr(PPSTACK_BRANCH), xstr(PPSTACK_VERSION));
+    return value;
 }
 
 psString ppStackSource(void)
 {
-#ifndef PPSTACK_SOURCE
-#error "PPSTACK_SOURCE is not set"
-#endif
-    return psStringCopy(PPSTACK_SOURCE);
+    return psStringCopy(xstr(PPSTACK_SOURCE));
 }
 
Index: /branches/eam_branches/eam_branch_20090303/ppStats/src/Makefile.am
===================================================================
--- /branches/eam_branches/eam_branch_20090303/ppStats/src/Makefile.am	(revision 23201)
+++ /branches/eam_branches/eam_branch_20090303/ppStats/src/Makefile.am	(revision 23202)
@@ -1,14 +1,14 @@
 lib_LTLIBRARIES = libppStats.la
 
-PPSTATS_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
-PPSTATS_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else svn info | sed -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'; fi`
-PPSTATS_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
+# PPSTATS_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
+# PPSTATS_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else svn info | sed -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'; fi`
+# PPSTATS_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
+# 
+# # Force recompilation of ppStatsVersion.c, since it gets the version information
+# ppStatsVersion.c: FORCE
+# 	touch ppStatsVersion.c
+# FORCE: ;
 
-# Force recompilation of ppStatsVersion.c, since it gets the version information
-ppStatsVersion.c: FORCE
-	touch ppStatsVersion.c
-FORCE: ;
-
-libppStats_la_CFLAGS = $(PPSTATS_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPPSTATS_VERSION=\"$(PPSTATS_VERSION)\" -DPPSTATS_BRANCH=\"$(PPSTATS_BRANCH)\" -DPPSTATS_SOURCE=\"$(PPSTATS_SOURCE)\"
+libppStats_la_CFLAGS = $(PPSTATS_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPPSTATS_VERSION=$(SVN_VERSION) -DPPSTATS_BRANCH=$(SVN_BRANCH) -DPPSTATS_SOURCE=$(SVN_SOURCE)
 libppStats_la_LDFLAGS = $(PPSTATS_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
 
Index: /branches/eam_branches/eam_branch_20090303/ppStats/src/ppStatsVersion.c
===================================================================
--- /branches/eam_branches/eam_branch_20090303/ppStats/src/ppStatsVersion.c	(revision 23201)
+++ /branches/eam_branches/eam_branch_20090303/ppStats/src/ppStatsVersion.c	(revision 23202)
@@ -1,6 +1,4 @@
 #include "ppStatsInternal.h"
 
-psString ppStatsVersion(void)
-{
 #ifndef PPSTATS_VERSION
 #error "PPSTATS_VERSION is not set"
@@ -9,13 +7,21 @@
 #error "PPSTATS_BRANCH is not set"
 #endif
-    return psStringCopy(PPSTATS_BRANCH "@" PPSTATS_VERSION);
+#ifndef PPSTATS_SOURCE
+#error "PPSTATS_SOURCE is not set"
+#endif
+
+#define xstr(s) str(s)
+#define str(s) #s
+
+psString ppStatsVersion(void)
+{
+    char *value = NULL;
+    psStringAppend(&value, "%s@%s", xstr(PPSTATS_BRANCH), xstr(PPSTATS_VERSION));
+    return value;
 }
 
 psString ppStatsSource(void)
 {
-#ifndef PPSTATS_SOURCE
-#error "PPSTATS_SOURCE is not set"
-#endif
-    return psStringCopy(PPSTATS_SOURCE);
+    return psStringCopy(xstr(PPSTATS_SOURCE));
 }
 
Index: /branches/eam_branches/eam_branch_20090303/ppSub/src/Makefile.am
===================================================================
--- /branches/eam_branches/eam_branch_20090303/ppSub/src/Makefile.am	(revision 23201)
+++ /branches/eam_branches/eam_branch_20090303/ppSub/src/Makefile.am	(revision 23202)
@@ -1,14 +1,14 @@
 bin_PROGRAMS = ppSub ppSubKernel
 
-PPSUB_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
-PPSUB_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else svn info | sed -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'; fi`
-PPSUB_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
+# PPSUB_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
+# PPSUB_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else svn info | sed -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'; fi`
+# PPSUB_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
+# 
+# # Force recompilation of ppSubVersion.c, since it gets the version information
+# ppSubVersion.c: FORCE
+# 	touch ppSubVersion.c
+# FORCE: ;
 
-# Force recompilation of ppSubVersion.c, since it gets the version information
-ppSubVersion.c: FORCE
-	touch ppSubVersion.c
-FORCE: ;
-
-ppSub_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PPSTATS_CFLAGS) $(PSPHOT_CFLAGS) $(PPSUB_CFLAGS) -DPPSUB_VERSION=\"$(PPSUB_VERSION)\" -DPPSUB_BRANCH=\"$(PPSUB_BRANCH)\" -DPPSUB_SOURCE=\"$(PPSUB_SOURCE)\"
+ppSub_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PPSTATS_CFLAGS) $(PSPHOT_CFLAGS) $(PPSUB_CFLAGS) -DPPSUB_VERSION=$(SVN_VERSION) -DPPSUB_BRANCH=$(SVN_BRANCH) -DPPSUB_SOURCE=$(SVN_SOURCE)
 ppSub_LDFLAGS  = $(PSLIB_LIBS)   $(PSMODULE_LIBS)   $(PPSTATS_LIBS)   $(PSPHOT_LIBS)   $(PPSUB_LIBS)
 
Index: /branches/eam_branches/eam_branch_20090303/ppSub/src/ppSubVersion.c
===================================================================
--- /branches/eam_branches/eam_branch_20090303/ppSub/src/ppSubVersion.c	(revision 23201)
+++ /branches/eam_branches/eam_branch_20090303/ppSub/src/ppSubVersion.c	(revision 23202)
@@ -22,6 +22,4 @@
 #include "ppSub.h"
 
-psString ppSubVersion(void)
-{
 #ifndef PPSUB_VERSION
 #error "PPSUB_VERSION is not set"
@@ -30,13 +28,21 @@
 #error "PPSUB_BRANCH is not set"
 #endif
-    return psStringCopy(PPSUB_BRANCH "@" PPSUB_VERSION);
+#ifndef PPSUB_SOURCE
+#error "PPSUB_SOURCE is not set"
+#endif
+
+#define xstr(s) str(s)
+#define str(s) #s
+
+psString ppSubVersion(void)
+{
+    char *value = NULL;
+    psStringAppend(&value, "%s@%s", xstr(PPSUB_BRANCH), xstr(PPSUB_VERSION));
+    return value;
 }
 
 psString ppSubSource(void)
 {
-#ifndef PPSUB_SOURCE
-#error "PPSUB_SOURCE is not set"
-#endif
-    return psStringCopy(PPSUB_SOURCE);
+    return psStringCopy(xstr(PPSUB_SOURCE));
 }
 
Index: /branches/eam_branches/eam_branch_20090303/psLib/src/sys/Makefile.am
===================================================================
--- /branches/eam_branches/eam_branch_20090303/psLib/src/sys/Makefile.am	(revision 23201)
+++ /branches/eam_branches/eam_branch_20090303/psLib/src/sys/Makefile.am	(revision 23202)
@@ -3,7 +3,7 @@
 noinst_LTLIBRARIES = libpslibsys.la
 
-PSLIB_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
-PSLIB_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else svn info | sed -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'; fi`
-PSLIB_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
+# PSLIB_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
+# PSLIB_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else svn info | sed -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'; fi`
+# PSLIB_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
 
 # Force recompilation of psConfigure.c, since it gets the version information
@@ -12,5 +12,5 @@
 FORCE: ;
 
-libpslibsys_la_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS) $(CFITSIO_CFLAGS) -DPSLIB_VERSION=\"$(PSLIB_VERSION)\" -DPSLIB_BRANCH=\"$(PSLIB_BRANCH)\" -DPSLIB_SOURCE=\"$(PSLIB_SOURCE)\"
+libpslibsys_la_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS) $(CFITSIO_CFLAGS) -DPSLIB_VERSION=$(SVN_VERSION) -DPSLIB_BRANCH=$(SVN_BRANCH) -DPSLIB_SOURCE=$(SVN_SOURCE)
 libpslibsys_la_SOURCES = \
 	psAbort.c \
Index: /branches/eam_branches/eam_branch_20090303/psLib/src/sys/psConfigure.c
===================================================================
--- /branches/eam_branches/eam_branch_20090303/psLib/src/sys/psConfigure.c	(revision 23201)
+++ /branches/eam_branches/eam_branch_20090303/psLib/src/sys/psConfigure.c	(revision 23202)
@@ -47,7 +47,4 @@
 static FILE *memCheckFile = NULL;       // File to which to write results of mem check
 
-
-psString psLibVersion(void)
-{
 #ifndef PSLIB_VERSION
 #error "PSLIB_VERSION is not set"
@@ -56,13 +53,21 @@
 #error "PSLIB_BRANCH is not set"
 #endif
-    return psStringCopy(PSLIB_BRANCH "@" PSLIB_VERSION);
+#ifndef PSLIB_SOURCE
+#error "PSLIB_SOURCE is not set"
+#endif
+
+#define xstr(s) str(s)
+#define str(s) #s
+
+psString psLibVersion(void)
+{
+    char *value = NULL;
+    psStringAppend(&value, "%s@%s", xstr(PSLIB_BRANCH), xstr(PSLIB_VERSION));
+    return value;
 }
 
 psString psLibSource(void)
 {
-#ifndef PSLIB_SOURCE
-#error "PSLIB_SOURCE is not set"
-#endif
-    return psStringCopy(PSLIB_SOURCE);
+    return psStringCopy(xstr(PSLIB_SOURCE));
 }
 
Index: /branches/eam_branches/eam_branch_20090303/psModules/src/config/Makefile.am
===================================================================
--- /branches/eam_branches/eam_branch_20090303/psModules/src/config/Makefile.am	(revision 23201)
+++ /branches/eam_branches/eam_branch_20090303/psModules/src/config/Makefile.am	(revision 23202)
@@ -1,14 +1,14 @@
 noinst_LTLIBRARIES = libpsmodulesconfig.la
 
-PSMODULES_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
-PSMODULES_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else svn info | sed -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'; fi`
-PSMODULES_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
+# PSMODULES_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
+# PSMODULES_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else svn info | sed -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'; fi`
+# PSMODULES_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
 
 # Force recompilation of pmVersion.c, since it gets the version information
-pmVersion.c: FORCE
-	touch pmVersion.c
-FORCE: ;
+# pmVersion.c: FORCE
+# 	touch pmVersion.c
+# FORCE: ;
 
-libpsmodulesconfig_la_CPPFLAGS = $(SRCINC) $(PSMODULES_CFLAGS) -DPSMODULES_VERSION=\"$(PSMODULES_VERSION)\" -DPSMODULES_BRANCH=\"$(PSMODULES_BRANCH)\" -DPSMODULES_SOURCE=\"$(PSMODULES_SOURCE)\"
+libpsmodulesconfig_la_CPPFLAGS = $(SRCINC) $(PSMODULES_CFLAGS) -DPSMODULES_VERSION=$(SVN_VERSION) -DPSMODULES_BRANCH=$(SVN_BRANCH) -DPSMODULES_SOURCE=$(SVN_SOURCE)
 libpsmodulesconfig_la_LDFLAGS  = -release $(PACKAGE_VERSION)
 libpsmodulesconfig_la_SOURCES  = \
Index: /branches/eam_branches/eam_branch_20090303/psModules/src/config/pmVersion.c
===================================================================
--- /branches/eam_branches/eam_branch_20090303/psModules/src/config/pmVersion.c	(revision 23201)
+++ /branches/eam_branches/eam_branch_20090303/psModules/src/config/pmVersion.c	(revision 23202)
@@ -8,6 +8,4 @@
 #include "pmVersion.h"
 
-psString psModulesVersion(void)
-{
 #ifndef PSMODULES_VERSION
 #error "PSMODULES_VERSION is not set"
@@ -16,13 +14,21 @@
 #error "PSMODULES_BRANCH is not set"
 #endif
-    return psStringCopy(PSMODULES_BRANCH "@" PSMODULES_VERSION);
+#ifndef PSMODULES_SOURCE
+#error "PSMODULES_SOURCE is not set"
+#endif
+
+#define xstr(s) str(s)
+#define str(s) #s
+
+psString psModulesVersion(void)
+{
+    char *value = NULL;
+    psStringAppend(&value, "%s@%s", xstr(PSMODULES_BRANCH), xstr(PSMODULES_VERSION));
+    return value;
 }
 
 psString psModulesSource(void)
 {
-#ifndef PSMODULES_SOURCE
-#error "PSMODULES_SOURCE is not set"
-#endif
-    return psStringCopy(PSMODULES_SOURCE);
+    return psStringCopy(xstr(PSMODULES_SOURCE));
 }
 
Index: /branches/eam_branches/eam_branch_20090303/psastro/src/Makefile.am
===================================================================
--- /branches/eam_branches/eam_branch_20090303/psastro/src/Makefile.am	(revision 23201)
+++ /branches/eam_branches/eam_branch_20090303/psastro/src/Makefile.am	(revision 23202)
@@ -1,14 +1,14 @@
 lib_LTLIBRARIES = libpsastro.la
 
-PSASTRO_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
-PSASTRO_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else svn info | sed -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'; fi`
-PSASTRO_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
+# PSASTRO_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
+# PSASTRO_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else svn info | sed -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'; fi`
+# PSASTRO_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
+# 
+# # Force recompilation of psastroVersion.c, since it gets the version information
+# psastroVersion.c: FORCE
+# 	touch psastroVersion.c
+# FORCE: ;
 
-# Force recompilation of psastroVersion.c, since it gets the version information
-psastroVersion.c: FORCE
-	touch psastroVersion.c
-FORCE: ;
-
-libpsastro_la_CFLAGS = $(PSASTRO_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPSASTRO_VERSION=\"$(PSASTRO_VERSION)\" -DPSASTRO_BRANCH=\"$(PSASTRO_BRANCH)\" -DPSASTRO_SOURCE=\"$(PSASTRO_SOURCE)\"
+libpsastro_la_CFLAGS = $(PSASTRO_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPSASTRO_VERSION=$(SVN_VERSION) -DPSASTRO_BRANCH=$(SVN_BRANCH) -DPSASTRO_SOURCE=$(SVN_SOURCE)
 libpsastro_la_LDFLAGS = $(PSASTRO_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
 
Index: /branches/eam_branches/eam_branch_20090303/psastro/src/psastroVersion.c
===================================================================
--- /branches/eam_branches/eam_branch_20090303/psastro/src/psastroVersion.c	(revision 23201)
+++ /branches/eam_branches/eam_branch_20090303/psastro/src/psastroVersion.c	(revision 23202)
@@ -10,6 +10,4 @@
 #include "psastroInternal.h"
 
-psString psastroVersion(void)
-{
 #ifndef PSASTRO_VERSION
 #error "PSASTRO_VERSION is not set"
@@ -18,13 +16,21 @@
 #error "PSASTRO_BRANCH is not set"
 #endif
-    return psStringCopy(PSASTRO_BRANCH "@" PSASTRO_VERSION);
+#ifndef PSASTRO_SOURCE
+#error "PSASTRO_SOURCE is not set"
+#endif
+
+#define xstr(s) str(s)
+#define str(s) #s
+
+psString psastroVersion(void)
+{
+    char *value = NULL;
+    psStringAppend(&value, "%s@%s", xstr(PSASTRO_BRANCH), xstr(PSASTRO_VERSION));
+    return value;
 }
 
 psString psastroSource(void)
 {
-#ifndef PSASTRO_SOURCE
-#error "PSASTRO_SOURCE is not set"
-#endif
-    return psStringCopy(PSASTRO_SOURCE);
+  return psStringCopy(xstr(PSASTRO_SOURCE));
 }
 
Index: /branches/eam_branches/eam_branch_20090303/psphot/src/Makefile.am
===================================================================
--- /branches/eam_branches/eam_branch_20090303/psphot/src/Makefile.am	(revision 23201)
+++ /branches/eam_branches/eam_branch_20090303/psphot/src/Makefile.am	(revision 23202)
@@ -1,14 +1,14 @@
 lib_LTLIBRARIES = libpsphot.la
 
-PSPHOT_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
-PSPHOT_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else svn info | sed -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'; fi`
-PSPHOT_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
+# PSPHOT_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
+# PSPHOT_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else svn info | sed -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'; fi`
+# PSPHOT_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
+# 
+# # Force recompilation of psphotVersion.c, since it gets the version information
+# psphotVersion.c: FORCE
+# 	touch psphotVersion.c
+# FORCE: ;
 
-# Force recompilation of psphotVersion.c, since it gets the version information
-psphotVersion.c: FORCE
-	touch psphotVersion.c
-FORCE: ;
-
-libpsphot_la_CFLAGS = $(PSPHOT_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPSPHOT_VERSION=\"$(PSPHOT_VERSION)\" -DPSPHOT_BRANCH=\"$(PSPHOT_BRANCH)\" -DPSPHOT_SOURCE=\"$(PSPHOT_SOURCE)\"
+libpsphot_la_CFLAGS = $(PSPHOT_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPSPHOT_VERSION=$(PSPHOT_VERSION) -DPSPHOT_BRANCH=$(PSPHOT_BRANCH) -DPSPHOT_SOURCE=$(SVN_SOURCE)
 libpsphot_la_LDFLAGS = $(PSPHOT_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
 
Index: /branches/eam_branches/eam_branch_20090303/psphot/src/psphotVersion.c
===================================================================
--- /branches/eam_branches/eam_branch_20090303/psphot/src/psphotVersion.c	(revision 23201)
+++ /branches/eam_branches/eam_branch_20090303/psphot/src/psphotVersion.c	(revision 23202)
@@ -5,6 +5,4 @@
 #endif
 
-psString psphotVersion(void)
-{
 #ifndef PSPHOT_VERSION
 #error "PSPHOT_VERSION is not set"
@@ -13,13 +11,21 @@
 #error "PSPHOT_BRANCH is not set"
 #endif
-    return psStringCopy(PSPHOT_BRANCH "@" PSPHOT_VERSION);
+#ifndef PSPHOT_SOURCE
+#error "PSPHOT_SOURCE is not set"
+#endif
+
+#define xstr(s) str(s)
+#define str(s) #s
+
+psString psphotVersion(void)
+{
+    char *value = NULL;
+    psStringAppend(&value, "%s@%s", xstr(PSPHOT_BRANCH), xstr(PSPHOT_VERSION));
+    return value;
 }
 
 psString psphotSource(void)
 {
-#ifndef PSPHOT_SOURCE
-#error "PSPHOT_SOURCE is not set"
-#endif
-    return psStringCopy(PSPHOT_SOURCE);
+    return psStringCopy(xstr(PSPHOT_SOURCE));
 }