Index: include/Slice/Preprocessor.h
===================================================================
*** Preprocessor.h      Thu Aug 25 13:15:03 2005
--- Preprocessor.h.save Wed Feb 16 14:22:18 2005
***************
*** 38,44 ****
      void printMakefileDependencies(Language);
      
      std::string getBaseName();
!     std::string getNotDirBaseName();
  private:
      
      bool checkInputFile();
--- 38,44 ----
      void printMakefileDependencies(Language);
      
      std::string getBaseName();
! 
  private:
      
      bool checkInputFile();
Index: src/Slice/Preprocessor.cpp
===================================================================
*** Preprocessor.cpp       Tue Apr 26 13:59:05 2005
--- Preprocessor.cpp.save    Thu Aug 25 13:24:18 2005
***************
*** 51,56 ****
--- 51,68 ----
      return base;
  }
  
+ string
+ Slice::Preprocessor::getNotDirBaseName()
+ {
+     string base(getBaseName());
+     string::size_type pos = base.rfind('/');
+     if (pos != string::npos)
+     {
+         base.erase(0, pos + 1);
+     }
+     return base;
+ }
+ 
  FILE*
  Slice::Preprocessor::preprocess(bool keepComments)
  {
Index: src/slice2freeze/Main.cpp
===================================================================
*** Main.cpp.save       Thu Feb 24 11:34:55 2005
--- Main.cpp    Thu Aug 25 13:41:22 2005
***************
*** 1293,1299 ****
          // Add an include file for each Slice file. Note that the .h extension
          // is replaced with headerExtension later.
          //
!       includes.push_back(icecpp.getBaseName() + ".h");
  
        FILE* cppHandle = icecpp.preprocess(false);
  
--- 1293,1299 ----
          // Add an include file for each Slice file. Note that the .h extension
          // is replaced with headerExtension later.
          //
!       includes.push_back(output + '/' + icecpp.getNotDirBaseName() + ".h");
  
        FILE* cppHandle = icecpp.preprocess(false);