--- a/ProjectDefinition.st	Mon Sep 12 16:15:47 2011 +0200
+++ b/ProjectDefinition.st	Mon Sep 12 16:26:23 2011 +0200
@@ -2046,7 +2046,7 @@
     "Created: / 22-08-2006 / 23:59:32 / cg"
 !
 
-additionalHeaderRulesUsingTemplate:template
+additionalHeaderRulesUsingTemplate:template pathConverter:pathConverter
     "rules for header files (of autoloaded classes).
      For each extended class, which is autoloaded (and therefore, we will not find a header file for it),
      generate a rule to create the header file only."
@@ -2056,7 +2056,7 @@
             |headerFileDirPath baseFilename|
 
             (eachExtendedClass isLoaded not or:[eachExtendedClass wasAutoloaded]) ifTrue:[
-                headerFileDirPath := self pathToPackage_win32:eachExtendedClass package.
+                headerFileDirPath := self perform:pathConverter with:eachExtendedClass package.
                 baseFilename := self filenameForClass:eachExtendedClass.
 
                 s nextPutAll:(template
@@ -2066,13 +2066,15 @@
         ].
     ].
 
-    "Created: / 12-09-2011 / 15:56:26 / cg"
+    "Created: / 12-09-2011 / 16:23:52 / cg"
 !
 
 additionalHeaderRules_bc_dot_mak
     "rules for header files (of autoloaded classes)"
 
-    ^ self additionalHeaderRulesUsingTemplate:(self singleHeaderRuleTemplate_bc_dot_mak)
+    ^ self 
+        additionalHeaderRulesUsingTemplate:(self singleHeaderRuleTemplate_bc_dot_mak)
+        pathConverter:#pathToPackage_win32:
 
     "Created: / 12-09-2011 / 15:44:09 / cg"
 !
@@ -2080,7 +2082,9 @@
 additionalHeaderRules_make_dot_proto
     "rules for header files (of autoloaded classes)"
 
-    ^ self additionalHeaderRulesUsingTemplate:(self singleHeaderRuleTemplate_make_dot_proto)
+    ^ self 
+        additionalHeaderRulesUsingTemplate:(self singleHeaderRuleTemplate_make_dot_proto)
+        pathConverter:#pathToPackage_unix:
 
     "Created: / 12-09-2011 / 15:44:28 / cg"
 !
@@ -2271,8 +2275,8 @@
     "rules for header files (of autoloaded classes)"
 
     ^ '
-$(INCLUDE_TOP)\%1\%2.$(H):
-    pushd $(INCLUDE_TOP)\%1 \
+%1\%2.$(H):
+    pushd %1 \
     & $(STC) $(FFLAGS) $(STCFLAGS) $(STC_MSGFORMAT) $(DBGFLAGS) $(DEFS) -C -headerOnly %2.st \
     & popd
 '
@@ -2284,8 +2288,8 @@
     "rules for header files (of autoloaded classes)"
 
     ^ '
-$(INCLUDE_TOP)/%1/%2.$(H):
-    pushd $(INCLUDE_TOP)/%1 \
+%1/%2.$(H):
+    pushd %1 \
     & $(STC) $(FFLAGS) $(STCFLAGS) $(STC_MSGFORMAT) $(DBGFLAGS) $(DEFS) -C -headerOnly %2.st \
     & popd
 '
@@ -6481,11 +6485,11 @@
 !ProjectDefinition class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.352 2011-09-12 14:15:47 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.353 2011-09-12 14:26:23 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.352 2011-09-12 14:15:47 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.353 2011-09-12 14:26:23 cg Exp $'
 !
 
 version_SVN