Browse Source

* packages splitted to base and extra

peter 23 years ago
parent
commit
73deb4a002
3 changed files with 180 additions and 178 deletions
  1. 174 175
      utils/fpcm/fpcmake.inc
  2. 1 1
      utils/fpcm/fpcmake.ini
  3. 5 2
      utils/fpcm/fpcmmain.pp

File diff suppressed because it is too large
+ 174 - 175
utils/fpcm/fpcmake.inc


+ 1 - 1
utils/fpcm/fpcmake.ini

@@ -274,7 +274,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 endif
 
 
 # Packages dir
 # Packages dir
-PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 
 
 
 
 [shelltools]
 [shelltools]

+ 5 - 2
utils/fpcm/fpcmmain.pp

@@ -1122,7 +1122,7 @@ implementation
         SetVariable('FPCDIR',s,false);
         SetVariable('FPCDIR',s,false);
         { PACKAGESDIR }
         { PACKAGESDIR }
         if GetVariable('PACKAGESDIR',false)='' then
         if GetVariable('PACKAGESDIR',false)='' then
-         SetVariable('PACKAGESDIR','$(FPCDIR)/packages',false);
+         SetVariable('PACKAGESDIR','$(FPCDIR)/packages/base $(FPCDIR)/packages/extra',false);
         { UNITSDIR }
         { UNITSDIR }
         if GetVariable('UNITSDIR',false)='' then
         if GetVariable('UNITSDIR',false)='' then
          SetVariable('UNITSDIR','$(FPCDIR)/units/$(TARGET)',false);
          SetVariable('UNITSDIR','$(FPCDIR)/units/$(TARGET)',false);
@@ -1477,7 +1477,10 @@ implementation
 end.
 end.
 {
 {
   $Log$
   $Log$
-  Revision 1.20  2002-01-27 21:42:35  peter
+  Revision 1.21  2002-01-29 17:48:53  peter
+    * packages splitted to base and extra
+
+  Revision 1.20  2002/01/27 21:42:35  peter
     * -r option to process target dirs also
     * -r option to process target dirs also
     * default changed to build only for current target
     * default changed to build only for current target
     * removed auto building of required packages
     * removed auto building of required packages

Some files were not shown because too many files changed in this diff