Index: trunk/ppMerge/src/Makefile.am
===================================================================
--- trunk/ppMerge/src/Makefile.am	(revision 23808)
+++ trunk/ppMerge/src/Makefile.am	(revision 38034)
@@ -1,25 +1,9 @@
 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: 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
+	pslib-setsvnversion.pl PPMERGE ppMergeVersionDefinitions.h.in ppMergeVersionDefinitions.h
 FORCE: ;
-
 
 ppMerge_CFLAGS = $(PPMERGE_CFLAGS) $(PPSTATS_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
