Pārlūkot izejas kodu

Remove obsolete packages/base and packages/extra in PACKAGESDIR variable

git-svn-id: trunk@35529 -
pierre 8 gadi atpakaļ
vecāks
revīzija
bd45a4ecfa
2 mainītis faili ar 2 papildinājumiem un 2 dzēšanām
  1. 1 1
      utils/fpcm/fpcmake.ini
  2. 1 1
      utils/fpcm/fpcmmain.pp

+ 1 - 1
utils/fpcm/fpcmake.ini

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

+ 1 - 1
utils/fpcm/fpcmmain.pp

@@ -1260,7 +1260,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 $(FPCDIR)/packages/base $(FPCDIR)/packages/extra $(FPCDIR)/packages',false);
+         SetVariable('PACKAGESDIR','$(FPCDIR) $(FPCDIR)/packages',false);
         { UNITSDIR }
         { UNITSDIR }
         if GetVariable('UNITSDIR',false)='' then
         if GetVariable('UNITSDIR',false)='' then
          SetVariable('UNITSDIR','$(FPCDIR)/units/$(FULLTARGET)',false);
          SetVariable('UNITSDIR','$(FPCDIR)/units/$(FULLTARGET)',false);