From a1312c6553bf22aea4c656d4836f087841e0b219 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Thu, 21 Aug 2003 05:34:21 +0000
Subject: [PATCH] remove egg-optchar-new

---
 dtool/Config.pp                  | 3 ---
 dtool/pptempl/Template.models.pp | 5 -----
 2 files changed, 8 deletions(-)

diff --git a/dtool/Config.pp b/dtool/Config.pp
index 7b9b98e17e..7cd63b286b 100644
--- a/dtool/Config.pp
+++ b/dtool/Config.pp
@@ -505,9 +505,6 @@
   #define OBJ .o
 #endif
 
-// Temporary, while we migrate egg-optchar.
-#define USE_EGG_OPTCHAR_NEW 1
-
 
 ///////////////////////////////////////////////////////////////////////
 // The following variables are only meaningful when BUILD_TYPE is
diff --git a/dtool/pptempl/Template.models.pp b/dtool/pptempl/Template.models.pp
index 9b78e6dea5..599d44fc50 100644
--- a/dtool/pptempl/Template.models.pp
+++ b/dtool/pptempl/Template.models.pp
@@ -348,12 +348,7 @@ $[TAB]touch $[TARGET_DIR]/$[egg]
 
    // And this is the actual optchar pass.
 $[target] : $[sources] $[TARGET_DIR]/stamp
-// Temporary: while we're migrating egg-optchar, we might test this command.
-#if $[USE_EGG_OPTCHAR_NEW]
-$[TAB]egg-optchar-new $[OPTCHAR_NEW_OPTS] -d $[TARGET_DIR] $[sources]
-#else
 $[TAB]egg-optchar $[OPTCHAR_OPTS] -d $[TARGET_DIR] $[sources]
-#endif
 #end optchar_egg