From eaaff62ba56b4be0a86d0f76d88f73dfdb5bc262 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Wed, 2 Dec 2009 11:42:34 +0000
Subject: [PATCH] Build pmerge.p3d too

---
 direct/src/p3d/panda3d.pdef | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/direct/src/p3d/panda3d.pdef b/direct/src/p3d/panda3d.pdef
index fe54c74ccf..4f865797b9 100755
--- a/direct/src/p3d/panda3d.pdef
+++ b/direct/src/p3d/panda3d.pdef
@@ -281,3 +281,16 @@ class ppatcher(p3d):
     require('panda3d')
 
     mainModule('direct.p3d.ppatcher')
+
+
+class pmerge(p3d):
+    # Another handy utility to go along with ppackage.  This
+    # merges multiple directory structures as created by
+    # ppackage into a single one.
+
+    config(display_name = "Panda3D Package Merger",
+           hidden = True, platform_specific = False,
+           keep_user_env = True)
+    require('panda3d')
+
+    mainModule('direct.p3d.pmerge')