Index: trunk/ppMerge/src/Makefile.am
===================================================================
--- trunk/ppMerge/src/Makefile.am	(revision 23790)
+++ trunk/ppMerge/src/Makefile.am	(revision 23800)
@@ -1,10 +1,27 @@
 bin_PROGRAMS = ppMerge
 
+if HAVE_SVNVERSION
+PPMERGE_VERSION=`$(SVNVERSION) ../..`
+else
+PPMERGE_VERSION="UNKNOWN"
+endif
+
+if HAVE_SVN
+PPMERGE_BRANCH=`$(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 }'`
+PPMERGE_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
+else
+PPMERGE_BRANCH="UNKNOWN"
+PPMERGE_SOURCE="UNKNOWN"
+endif
+
 # Force recompilation of ppMergeVersion.c, since it gets the version information
-ppMergeVersion.c: FORCE
-	touch ppMergeVersion.c
+ppMergeVersion.c: ppMergeVersionDefinitions.h
+ppMergeVersionDefinitions.h: ppMergeVersionDefinitions.h.in FORCE
+	-$(RM) ppMergeVersionDefinitions.h
+	$(SED) -e "s|@PPMERGE_VERSION@|\"$(PPMERGE_VERSION)\"|" -e "s|@PPMERGE_BRANCH@|\"$(PPMERGE_BRANCH)\"|" -e "s|@PPMERGE_SOURCE@|\"$(PPMERGE_SOURCE)\"|" ppMergeVersionDefinitions.h.in > ppMergeVersionDefinitions.h
 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)
 ppMerge_LDFLAGS = $(PPMERGE_LIBS) $(PPSTATS_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)