浏览代码

* support mainpackage/subpackage. This allows to use things like
gnome1/gconf as required package

peter 23 年之前
父节点
当前提交
2b92d5d89d
共有 1 个文件被更改,包括 6 次插入2 次删除
  1. 6 2
      utils/fpcm/fpcmmain.pp

+ 6 - 2
utils/fpcm/fpcmmain.pp

@@ -798,7 +798,7 @@ implementation
              ReqFPCMake.LoadSections;
              ReqFPCMake.LoadSections;
              ReqFPCMake.LoadPackageSection;
              ReqFPCMake.LoadPackageSection;
              { Check package name and version }
              { Check package name and version }
-             if LowerCase(ReqFPCMake.PackageName)<>ReqName then
+             if LowerCase(ReqFPCMake.PackageName)<>ExtractFileName(ReqName) then
               raise Exception.Create(Format(s_wrong_package_name,[ReqName,LowerCase(ReqFPCMake.PackageName)]));
               raise Exception.Create(Format(s_wrong_package_name,[ReqName,LowerCase(ReqFPCMake.PackageName)]));
              if (ReqVersion<>'') and (ReqFPCMake.PackageVersion<ReqVersion) then
              if (ReqVersion<>'') and (ReqFPCMake.PackageVersion<ReqVersion) then
               raise Exception.Create(Format(s_wrong_package_version,[ReqVersion,ReqFPCMake.PackageVersion]));
               raise Exception.Create(Format(s_wrong_package_version,[ReqVersion,ReqFPCMake.PackageVersion]));
@@ -1483,7 +1483,11 @@ implementation
 end.
 end.
 {
 {
   $Log$
   $Log$
-  Revision 1.26  2002-09-07 15:40:31  peter
+  Revision 1.27  2002-10-07 18:41:02  peter
+    * support mainpackage/subpackage. This allows to use things like
+      gnome1/gconf as required package
+
+  Revision 1.26  2002/09/07 15:40:31  peter
     * old logs removed and tabs fixed
     * old logs removed and tabs fixed
 
 
   Revision 1.25  2002/07/30 13:18:42  marco
   Revision 1.25  2002/07/30 13:18:42  marco