diff --git a/Documentation/ChangeLog b/Documentation/ChangeLog
index f4f0431..f43db13 100644
--- a/Documentation/ChangeLog
+++ b/Documentation/ChangeLog
@@ -1,3 +1,25 @@
+2004-07-04 Serg Stoyan <stoyan255@ukr.net>
+
+	* Library/PCProject.m:
+	(projectFileFromFile:forKey:): If adding files from subproject to
+	project add it with relative path to project's one.
+
+	* Modules/ApplicationProject/PCAppProject.m:
+	(writeMakefile): Do not add "Resources/" prefix if resource file
+	is part of subproject.
+	
+	* Modules/BundleProject/PCBundleProject.m: 
+	(writeMakefile): ditto.
+	
+	* Modules/LibraryProject/PCLibProject.m: 
+	(writeMakefile): ditto.
+	
+	* Modules/RenaissanceProject/PCRenaissanceProject.m: 
+	(writeMakefile): ditto.
+
+	* Modules/ToolProject/PCToolProject.m: 
+	(writeMakefile): ditto.
+	
 2004-07-03 Serg Stoyan <stoyan255@ukr.net>
 
 	* Library/PCProjectManager.m:
diff --git a/Library/PCProject.m b/Library/PCProject.m
index d0eb51f..688555b 100644
--- a/Library/PCProject.m
+++ b/Library/PCProject.m
@@ -621,8 +621,22 @@ NSString
 - (NSString *)projectFileFromFile:(NSString *)file forKey:(NSString *)type
 {
   NSMutableString *projectFile = nil;
+  NSString        *path = nil;
+  NSRange         pathRange;
 
-  projectFile = [NSMutableString stringWithString:[file lastPathComponent]];
+  path = [file stringByDeletingLastPathComponent];
+  pathRange = [path rangeOfString:projectPath];
+
+  if (pathRange.length)
+    {
+      pathRange.length++;
+      projectFile = [NSMutableString stringWithString:file];
+      [projectFile deleteCharactersInRange:pathRange];
+    }
+  else
+    {
+      projectFile = [NSMutableString stringWithString:[file lastPathComponent]];
+    }
 
   if ([type isEqualToString:PCLibraries])
     {
diff --git a/Modules/ApplicationProject/PCAppProject.m b/Modules/ApplicationProject/PCAppProject.m
index 54e710a..5b6b025 100644
--- a/Modules/ApplicationProject/PCAppProject.m
+++ b/Modules/ApplicationProject/PCAppProject.m
@@ -439,8 +439,12 @@
 
       for (j = 0; j < [resources count]; j++)
 	{
-	  resourceItem = [NSString stringWithFormat:@"Resources/%@",
-	                  [resources objectAtIndex:j]];
+	  resourceItem = [resources objectAtIndex:j];
+	  if ([[resourceItem pathComponents] count] == 1)
+	    {
+	      resourceItem = [NSString stringWithFormat:@"Resources/%@",
+	                      resourceItem];
+	    }
 	  [resources replaceObjectAtIndex:j
 	                       withObject:resourceItem];
 	}
diff --git a/Modules/BundleProject/PCBundleProject.m b/Modules/BundleProject/PCBundleProject.m
index 22994da..22389cc 100644
--- a/Modules/BundleProject/PCBundleProject.m
+++ b/Modules/BundleProject/PCBundleProject.m
@@ -180,8 +180,12 @@
 
       for (j = 0; j < [resources count]; j++)
 	{
-	  resourceItem = [NSString stringWithFormat:@"Resources/%@",
-	                  [resources objectAtIndex:j]];
+	  resourceItem = [resources objectAtIndex:j];
+	  if ([[resourceItem pathComponents] count] == 1)
+	    {
+	      resourceItem = [NSString stringWithFormat:@"Resources/%@",
+	                      resourceItem];
+	    }
 	  [resources replaceObjectAtIndex:j 
 	                       withObject:resourceItem];
 	}
diff --git a/Modules/LibraryProject/PCLibProject.m b/Modules/LibraryProject/PCLibProject.m
index 27ce6b2..10181b1 100644
--- a/Modules/LibraryProject/PCLibProject.m
+++ b/Modules/LibraryProject/PCLibProject.m
@@ -235,8 +235,12 @@
 
       for (j = 0; j < [resources count]; j++)
 	{
-	  resourceItem = [NSString stringWithFormat:@"Resources/%@",
-	                  [resources objectAtIndex:j]];
+	  resourceItem = [resources objectAtIndex:j];
+	  if ([[resourceItem pathComponents] count] == 1)
+	    {
+	      resourceItem = [NSString stringWithFormat:@"Resources/%@",
+	                      resourceItem];
+	    }
 	  [resources replaceObjectAtIndex:j 
 	                       withObject:resourceItem];
 	}
diff --git a/Modules/RenaissanceProject/PCRenaissanceProject.m b/Modules/RenaissanceProject/PCRenaissanceProject.m
index 1e869c5..0c99a66 100644
--- a/Modules/RenaissanceProject/PCRenaissanceProject.m
+++ b/Modules/RenaissanceProject/PCRenaissanceProject.m
@@ -444,8 +444,12 @@
 
       for (j = 0; j < [resources count]; j++)                                   
 	{                                                                       
-	  resourceItem = [NSString stringWithFormat:@"Resources/%@",            
-	                  [resources objectAtIndex:j]];
+	  resourceItem = [resources objectAtIndex:j];
+	  if ([[resourceItem pathComponents] count] == 1)
+	    {
+	      resourceItem = [NSString stringWithFormat:@"Resources/%@",
+	                      resourceItem];
+	    }
 	  [resources replaceObjectAtIndex:j
 	                       withObject:resourceItem];
 	}
diff --git a/Modules/ToolProject/PCToolProject.m b/Modules/ToolProject/PCToolProject.m
index 5ab0e48..8f0522e 100644
--- a/Modules/ToolProject/PCToolProject.m
+++ b/Modules/ToolProject/PCToolProject.m
@@ -248,8 +248,12 @@
 
       for (j = 0; j < [resources count]; j++)
 	{
-	  resourceItem = [NSString stringWithFormat:@"Resources/%@",
-	                  [resources objectAtIndex:j]];
+	  resourceItem = [resources objectAtIndex:j];
+	  if ([[resourceItem pathComponents] count] == 1)
+	    {
+	      resourceItem = [NSString stringWithFormat:@"Resources/%@",
+	                      resourceItem];
+	    }
 	  [resources replaceObjectAtIndex:j
 	                       withObject:resourceItem];
 	}