From 0c13c5c76316a97d014fb679571a9ea6d1b2e9b2 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Mon, 21 Jul 2003 16:55:39 +0000
Subject: [PATCH] fix depedencies on cygwin/unix

---
 dtool/Config.pp                 | 2 +-
 dtool/pptempl/Template.gmsvc.pp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dtool/Config.pp b/dtool/Config.pp
index be8b4b196b..7cd63b286b 100644
--- a/dtool/Config.pp
+++ b/dtool/Config.pp
@@ -486,7 +486,7 @@
 // this variable, $[source] is the name of the file to read, $[target]
 // is the name of the file to generate, and $[script] is the one-line
 // sed script to run.
-#defer SED ppremake -s '$[script]' <$[source] >$[target]
+#defer SED ppremake -s "$[script]" <$[source] >$[target]
 
 // What directory name (within each source directory) should the .o
 // (or .obj) files be written to?  This can be any name, and it can be
diff --git a/dtool/pptempl/Template.gmsvc.pp b/dtool/pptempl/Template.gmsvc.pp
index 9439bf5896..5b6b4af2e5 100644
--- a/dtool/pptempl/Template.gmsvc.pp
+++ b/dtool/pptempl/Template.gmsvc.pp
@@ -359,7 +359,7 @@ $[varname] = $[sources]
 
 // not parallel (requires gmake 3.79) because of link.exe conflicts in TMP dir (see audiotraits dir)
 #if $[GENERATE_BUILDDATE]
-.NOTPARALLEL $[target] : $[sources] $[static_lib_dependencies] $[dtool_ver_dir_cyg]/version.rc $[dtool_ver_dir_cyg]/$[DLLBASEADDRFILENAME]
+.NOTPARALLEL $[target] : $[sources] $[static_lib_dependencies] $[dtool_ver_dir_cyg]/version.rc $[DLLBASEADDRFILENAME:%=$[dtool_ver_dir_cyg]/%]
 // first generate builddate for rc compiler using compiler preprocessor
 $[TAB]  mkdir -p $[tmpdirname_cyg]  // this dir-creation-stuff is leftover from trying to resolve parallel link difficulties
  #define VER_RESOURCE "$[tmpdirname_win]\$[mybasename].res"
@@ -371,7 +371,7 @@ $[TAB] $[SHARED_LIB_C++] $[VER_RESOURCE]
 $[TAB] $[SHARED_LIB_C] $[VER_RESOURCE]
   #endif
 #else
-.NOTPARALLEL $[target] : $[sources] $[dtool_ver_dir_cyg]/$[DLLBASEADDRFILENAME]
+.NOTPARALLEL $[target] : $[sources] $[DLLBASEADDRFILENAME:%=$[dtool_ver_dir_cyg]/%]
   #if $[filter %.cxx %.cpp %.yxx %.lxx,$[get_sources]]
 $[TAB] $[SHARED_LIB_C++]
   #else