From 585fd87124e00e487d12276ff5ff521ac1d7e52f Mon Sep 17 00:00:00 2001 From: David Rose Date: Thu, 1 Mar 2001 23:20:22 +0000 Subject: [PATCH] *** empty log message *** --- dtool/pptempl/Template.models.pp | 7 +++---- dtool/src/interrogate/interrogateBuilder.cxx | 1 - 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dtool/pptempl/Template.models.pp b/dtool/pptempl/Template.models.pp index 8296f5ee13..d181e151df 100644 --- a/dtool/pptempl/Template.models.pp +++ b/dtool/pptempl/Template.models.pp @@ -275,12 +275,11 @@ $[dest]/$[local] : $[sourcedir]/$[local] #end egg #foreach egg $[UNPAL_SOURCES] #define local $[egg] - #define sourcedir $[SOURCE_DIR] #define dest $[install_model_dir] -$[dest]/$[local] : $[sourcedir]/$[local] -// cd ./$[sourcedir] && $[INSTALL] +$[dest]/$[local] : $[source_prefix]$[local] +// $[INSTALL] rm -f $[dest]/$[local] - cp $[sourcedir]/$[local] $[dest] + cp $[source_prefix]$[local] $[dest] #end egg #end install_egg diff --git a/dtool/src/interrogate/interrogateBuilder.cxx b/dtool/src/interrogate/interrogateBuilder.cxx index 88e5919d62..2ce1cc6fdf 100644 --- a/dtool/src/interrogate/interrogateBuilder.cxx +++ b/dtool/src/interrogate/interrogateBuilder.cxx @@ -155,7 +155,6 @@ do_command(const string &command, const string ¶ms) { } else { type = type->resolve_type(&parser, &parser); _renametype[type->get_local_name(&parser)] = new_name; - nout << "Renaming " << *type << " to " << new_name << "\n"; } }