* fixed vpath setting

utils/fpcm/fpcmake.inc

@@ -924,14 +924,15 @@ const fpcmakeini : array[0..118,1..240] of char=(
   '        $(EXECPPAS)'#010+
   #010+
   '# Search paths for .ppu and .pp and .pas'#010,
-  'vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCDIR)'#010+
-  'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCDIR)'#010+
+  'vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
+  'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
   'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+
   #010+
   #010+
   '[libraryrules]'#010+
-  '#####################################################################'#010+
-  '# Lib','rary'#010+
+  '###################################################################','#'+
+  '#'#010+
+  '# Library'#010+
   '#####################################################################'#010+
   #010+
   '.PHONY: fpc_shared'#010+
@@ -944,7 +945,7 @@ const fpcmakeini : array[0..118,1..240] of char=(
   'endif'#010+
   'endif'#010+
   #010+
-  '# Default sharedlib uni','ts are all unit objects'#010+
+  '# Default share','dlib units are all unit objects'#010+
   'ifndef LIB_SHAREDUNITS'#010+
   'LIB_SHAREDUNITS:=$(TARGET_UNITS)'#010+
   'endif'#010+
@@ -954,17 +955,17 @@ const fpcmakeini : array[0..118,1..240] of char=(
   '        $(PPUMOVE) $(LIB_SHAREDUNITS) -o$(LIB_FULLNAME)'#010+
   'else'#010+
   '        @$(ECHO) Shared Libraries not supported'#010+
-  'endif'#010+
+  'e','ndif'#010+
   #010+
   #010+
-  '[','installrules]'#010+
+  '[installrules]'#010+
   '#####################################################################'#010+
   '# Install rules'#010+
   '#####################################################################'#010+
   #010+
   '.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall'#010+
   #010+
-  'ifdef INSTA','LL_UNITS'#010+
+  'ifd','ef INSTALL_UNITS'#010+
   'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+
   'endif'#010+
   #010+
@@ -972,21 +973,21 @@ const fpcmakeini : array[0..118,1..240] of char=(
   'ifdef PPUFILES'#010+
   'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALL'+
   'PPUFILES))'#010+
-  'override INSTALLPPULINKFILES:=$(addprefi','x $(UNITTARGETDIRPREFIX),$(s'+
+  'override INSTALLPPULINKFILES:=$(','addprefix $(UNITTARGETDIRPREFIX),$(s'+
   'hell $(PPUFILES) -S -O $(INSTALLPPUFILES)))'#010+
   'else'#010+
   'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+
   'LES)) $(addprefix $(LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INS'+
-  'TALLPPUFILES)))'#010+
-  'overrid','e INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTA'+
-  'LLPPUFILES))'#010+
+  'TALLPPUFILES)))',#010+
+  'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALL'+
+  'PPUFILES))'#010+
   'override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPR'+
   'EFIX),$(INSTALLPPULINKFILES)))'#010+
   'endif'#010+
   'endif'#010+
   #010+
   'ifdef INSTALLEXEFILES'#010+
-  'override INSTALLEXEFILES:=$(ad','dprefix $(TARGETDIRPREFIX),$(INSTALLEX'+
+  'override INSTALLEXEFIL','ES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEX'+
   'EFILES))'#010+
   'endif'#010+
   #010+
@@ -997,21 +998,21 @@ const fpcmakeini : array[0..118,1..240] of char=(
   '        $(MKDIR) $(INSTALL_BINDIR)'#010+
   '# Compress the exes if upx is defined'#010+
   'ifdef UPXPROG'#010+
-  '        -$(UPXPROG) ','$(INSTALLEXEFILES)'#010+
+  '        -$(U','PXPROG) $(INSTALLEXEFILES)'#010+
   'endif'#010+
   '        $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+
   'endif'#010+
   'ifdef INSTALLPPUFILES'#010+
   '        $(MKDIR) $(INSTALL_UNITDIR)'#010+
   '        $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+
-  'ifneq ($(INSTALLPPULINKFILES),)'#010+
-  '   ','     $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+
+  'ifneq ($(INSTALLPPULINKFILE','S),)'#010+
+  '        $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+
   'endif'#010+
   'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+
   '        $(MKDIR) $(INSTALL_LIBDIR)'#010+
   '        $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+
   'ifdef inUnix'#010+
-  '        ln -sf $(LIB_FULLNAME) $(INSTA','LL_LIBDIR)/$(LIB_NAME)'#010+
+  '        ln -sf $(LIB_FULLNAME)',' $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+
   'endif'#010+
   'endif'#010+
   'endif'#010+
@@ -1022,14 +1023,14 @@ const fpcmakeini : array[0..118,1..240] of char=(
   #010+
   'fpc_sourceinstall: distclean'#010+
   '        $(MKDIR) $(INSTALL_SOURCEDIR)'#010+
-  '        $(COPY','TREE) $(BASEDIR) $(INSTALL_SOURCEDIR)'#010+
+  '      ','  $(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)'#010+
   #010+
   'fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))'#010+
   'ifdef EXAMPLESOURCEFILES'#010+
   '        $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+
   '        $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+
-  'endif'#010+
-  'ifdef',' TARGET_EXAMPLEDIRS'#010+
+  'end','if'#010+
+  'ifdef TARGET_EXAMPLEDIRS'#010+
   'ifndef EXAMPLESOURCEFILES'#010+
   '        $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+
   'endif'#010+
@@ -1040,14 +1041,14 @@ const fpcmakeini : array[0..118,1..240] of char=(
   'fpc_distinstall: fpc_install fpc_exampleinstall'#010+
   #010+
   #010+
-  '[zipinstallr','ules]'#010+
+  '[zip','installrules]'#010+
   '#####################################################################'#010+
   '# Zip'#010+
   '#####################################################################'#010+
   #010+
   '.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#010+
   #010+
-  '# Temporary path to ','pack a file'#010+
+  '# Temporary ','path to pack a file'#010+
   'ifndef PACKDIR'#010+
   'ifndef inUnix'#010+
   'PACKDIR=$(BASEDIR)/../pack_tmp/$(PACKAGE_NAME)'#010+
@@ -1059,7 +1060,7 @@ const fpcmakeini : array[0..118,1..240] of char=(
   '# Maybe create default zipname from packagename'#010+
   'ifndef ZIPNAME'#010+
   'ifdef DIST_ZIPNAME'#010+
-  'ZIPNAME=$(DIST','_ZIPNAME)'#010+
+  'ZIPNAM','E=$(DIST_ZIPNAME)'#010+
   'else'#010+
   'ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)'#010+
   'endif'#010+
@@ -1075,8 +1076,8 @@ const fpcmakeini : array[0..118,1..240] of char=(
   'endif'#010+
   #010+
   '# Use tar by default under linux'#010+
-  'ifndef USEZIP'#010+
-  'ifdef ','inUnix'#010+
+  'ifndef USEZI','P'#010+
+  'ifdef inUnix'#010+
   'USETAR=1'#010+
   'endif'#010+
   'endif'#010+
@@ -1088,14 +1089,14 @@ const fpcmakeini : array[0..118,1..240] of char=(
   #010+
   '# Create commands to create the zip/tar file'#010+
   'ZIPWRAPPER=$(DIST_DESTDIR)/fpczip$(BATCHEXT)'#010+
-  'ZIPCMD_CDPACK:=cd $(subst /,$(PATHSEP),$(PA','CKDIR))'#010+
+  'ZIPCMD_CDPACK:=cd $(subst /,$(PATHS','EP),$(PACKDIR))'#010+
   'ZIPCMD_CDBASE:=cd $(subst /,$(PATHSEP),$(BASEDIR))'#010+
   'ifdef USETAR'#010+
   'ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)'#010+
   'ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *'#010+
   'else'#010+
   'ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)'#010+
-  'ZIPCMD_ZIP:=$','(subst /,$(PATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDEST'+
+  'ZIPCM','D_ZIP:=$(subst /,$(PATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDEST'+
   'FILE) *'#010+
   'endif'#010+
   #010+
@@ -1104,13 +1105,13 @@ const fpcmakeini : array[0..118,1..240] of char=(
   '        $(DEL) $(ZIPDESTFILE)'#010+
   'ifdef USEZIPWRAPPER'#010+
   'ifneq ($(ECHO),echo)'#010+
-  '        $(ECHO)',' "$(ZIPCMD_CDPACK)" > $(ZIPWRAPPER)'#010+
+  '       ',' $(ECHO) "$(ZIPCMD_CDPACK)" > $(ZIPWRAPPER)'#010+
   '        $(ECHO) "$(ZIPCMD_ZIP)" >> $(ZIPWRAPPER)'#010+
   '        $(ECHO) "$(ZIPCMD_CDBASE)" >> $(ZIPWRAPPER)'#010+
   'else'#010+
   '        $(ECHO) $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+
-  '        $(ECHO) $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+
-  '  ','      $(ECHO) $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+
+  '        $(ECHO) $(ZIPCMD_ZIP) >> $(ZIPWRA','PPER)'#010+
+  '        $(ECHO) $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+
   'endif'#010+
   'ifdef inUnix'#010+
   '        /bin/sh $(ZIPWRAPPER)'#010+
@@ -1121,7 +1122,7 @@ const fpcmakeini : array[0..118,1..240] of char=(
   'else'#010+
   '        $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010+
   'endif'#010+
-  '        $(','DELTREE) $(PACKDIR)'#010+
+  '  ','      $(DELTREE) $(PACKDIR)'#010+
   #010+
   'fpc_zipsourceinstall:'#010+
   '        $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src'#010+
@@ -1130,7 +1131,7 @@ const fpcmakeini : array[0..118,1..240] of char=(
   '        $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm'#010+
   #010+
   'fpc_zipdistinstall:'#010+
-  '        $(MAK','E) fpc_zipinstall ZIPTARGET=distinstall'#010+
+  '     ','   $(MAKE) fpc_zipinstall ZIPTARGET=distinstall'#010+
   #010+
   #010+
   '[cleanrules]'#010+
@@ -1138,7 +1139,7 @@ const fpcmakeini : array[0..118,1..240] of char=(
   '# Clean rules'#010+
   '#####################################################################'#010+
   #010+
-  '.PHONY: fpc_clean fpc_cleanall',' fpc_distclean'#010+
+  '.PHONY: fpc_clean fpc_','cleanall fpc_distclean'#010+
   #010+
   'ifdef EXEFILES'#010+
   'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES'+
@@ -1150,13 +1151,13 @@ const fpcmakeini : array[0..118,1..240] of char=(
   'endif'#010+
   #010+
   'ifdef CLEANPPUFILES'#010+
-  'override CLEANPPUFILES',':=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPP'+
+  'override CLEAN','PPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPP'+
   'UFILES))'#010+
   '# Get the .o and .a files created for the units'#010+
   'ifdef PPUFILES'#010+
   'CLEANPPULINKFILES:=$(shell $(PPUFILES) $(CLEANPPUFILES))'#010+
   'else'#010+
-  'CLEANPPULINKFILES:=$(wildcard $(subst $(PPUEXT),$(OEXT),$(CL','EANPPUFI'+
+  'CLEANPPULINKFILES:=$(wildcard $(subst $(PPUEXT),$(OE','XT),$(CLEANPPUFI'+
   'LES)) $(addprefix $(LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLE'+
   'ANPPUFILES))))'#010+
   'endif'#010+
@@ -1165,8 +1166,8 @@ const fpcmakeini : array[0..118,1..240] of char=(
   'endif'#010+
   #010+
   'fpc_clean: $(CLEANTARGET)'#010+
-  'ifdef CLEANEXEFILES'#010+
-  '   ','     -$(DEL) $(CLEANEXEFILES)'#010+
+  'ifdef CLEANEXEF','ILES'#010+
+  '        -$(DEL) $(CLEANEXEFILES)'#010+
   'endif'#010+
   'ifdef CLEANPPUFILES'#010+
   '        -$(DEL) $(CLEANPPUFILES)'#010+
@@ -1175,7 +1176,7 @@ const fpcmakeini : array[0..118,1..240] of char=(
   '        -$(DEL) $(CLEANPPULINKFILES)'#010+
   'endif'#010+
   'ifdef CLEANRSTFILES'#010+
-  '        -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$','(CLEANRSTFILES))'+
+  '        -$(DEL) $(addprefix $(UNITTARGETDIRP','REFIX),$(CLEANRSTFILES))'+
   #010+
   'endif'#010+
   'ifdef CLEAN_FILES'#010+
@@ -1187,7 +1188,7 @@ const fpcmakeini : array[0..118,1..240] of char=(
   '        -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)'+
   #010+
   #010+
-  'fpc_distclean: fpc_clean'#010,
+  'fpc_distclean: fp','c_clean'#010+
   #010+
   '# Also run clean first if targetdir is set. Unittargetdir is always'#010+
   '# set if targetdir or unittargetdir is specified'#010+
@@ -1196,13 +1197,13 @@ const fpcmakeini : array[0..118,1..240] of char=(
   'endif'#010+
   #010+
   'fpc_cleanall: $(CLEANTARGET) $(TARGETDIRCLEAN)'#010+
-  'ifdef CLEANEXE','FILES'#010+
+  'ifdef ','CLEANEXEFILES'#010+
   '        -$(DEL) $(CLEANEXEFILES)'#010+
   'endif'#010+
   '        -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+
   'EXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+
   '        -$(DELTREE) *$(SMARTEXT)'#010+
-  '        -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $','(REDIRFIL'+
+  '        -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEX','TFILE) $(REDIRFIL'+
   'E)'#010+
   #010+
   #010+
@@ -1215,70 +1216,70 @@ const fpcmakeini : array[0..118,1..240] of char=(
   #010+
   'fpc_info:'#010+
   '        @$(ECHO)'#010+
-  '        @$(ECHO',')  == Package info =='#010+
+  '       ',' @$(ECHO)  == Package info =='#010+
   '        @$(ECHO)  Package Name..... $(PACKAGE_NAME)'#010+
   '        @$(ECHO)  Package Version.. $(PACKAGE_VERSION)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  == Configuration info =='#010+
   '        @$(ECHO)'#010+
-  '        @$(ECHO)  FPC.......... $(','FPC)'#010+
+  '        @$(ECHO)  FPC.....','..... $(FPC)'#010+
   '        @$(ECHO)  FPC Version.. $(FPC_VERSION)'#010+
   '        @$(ECHO)  Source CPU... $(CPU_SOURCE)'#010+
   '        @$(ECHO)  Target CPU... $(CPU_TARGET)'#010+
   '        @$(ECHO)  Source OS.... $(OS_SOURCE)'#010+
-  '        @$(ECHO)  Target OS.... $(OS_TARGET)'#010+
-  '      ','  @$(ECHO)'#010+
+  '        @$(ECHO)  Target OS.... $(OS_TARGET',')'#010+
+  '        @$(ECHO)'#010+
   '        @$(ECHO)  == Directory info =='#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  Basedir......... $(BASEDIR)'#010+
   '        @$(ECHO)  FPCDir.......... $(FPCDIR)'#010+
   '        @$(ECHO)  UnitsDir........ $(UNITSDIR)'#010+
-  '        @$(ECHO)  PackagesDir..... ','$(PACKAGESDIR)'#010+
+  '        @$(ECHO)  PackagesD','ir..... $(PACKAGESDIR)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  GCC library..... $(GCCLIBDIR)'#010+
   '        @$(ECHO)  Other library... $(OTHERLIBDIR)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  == Tools info =='#010+
   '        @$(ECHO)'#010+
-  '        @$(ECHO)  Pwd....... $(PWD)'#010+
-  '     ','   @$(ECHO)  Echo...... $(ECHO)'#010+
+  '        @$(ECHO)  Pwd....... $(PW','D)'#010+
+  '        @$(ECHO)  Echo...... $(ECHO)'#010+
   '        @$(ECHO)  PPUMove... $(PPUMOVE)'#010+
   '        @$(ECHO)  PPUFiles.. $(PPUFILES)'#010+
   '        @$(ECHO)  Date...... $(DATE)'#010+
   '        @$(ECHO)  Upx....... $(UPXPROG)'#010+
   '        @$(ECHO)  Zip....... $(ZIPPROG)'#010+
-  '        @$','(ECHO)'#010+
+  '  ','      @$(ECHO)'#010+
   '        @$(ECHO)  == Object info =='#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  Target Loaders...... $(TARGET_LOADERS)'#010+
   '        @$(ECHO)  Target Units........ $(TARGET_UNITS)'#010+
   '        @$(ECHO)  Target Programs..... $(TARGET_PROGRAMS)'#010+
-  '        @$','(ECHO)  Target Dirs......... $(TARGET_DIRS)'#010+
+  '  ','      @$(ECHO)  Target Dirs......... $(TARGET_DIRS)'#010+
   '        @$(ECHO)  Target Examples..... $(TARGET_EXAMPLES)'#010+
   '        @$(ECHO)  Target ExampleDirs.. $(TARGET_EXAMPLEDIRS)'#010+
   '        @$(ECHO)'#010+
-  '        @$(ECHO)  Clean Units......... $(CLEAN_UNITS)'#010+
-  '      ','  @$(ECHO)  Clean Files......... $(CLEAN_FILES)'#010+
+  '        @$(ECHO)  Clean Units......... $(CLEAN_UNITS',')'#010+
+  '        @$(ECHO)  Clean Files......... $(CLEAN_FILES)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  Install Units....... $(INSTALL_UNITS)'#010+
   '        @$(ECHO)  Install Files....... $(INSTALL_FILES)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  == Install info =='#010+
-  '        @','$(ECHO)'#010+
+  ' ','       @$(ECHO)'#010+
   '        @$(ECHO)  DateStr.............. $(DATESTR)'#010+
   '        @$(ECHO)  ZipPrefix............ $(ZIPPREFIX)'#010+
   '        @$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)'#010+
   '        @$(ECHO)'#010+
-  '        @$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)',#010+
+  '        @$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_','BASEDIR)'#010+
   '        @$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)'#010+
   '        @$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)'#010+
   '        @$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)'#010+
-  '        @$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)'#010+
-  '   ','     @$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)'#010+
+  '        @$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCE','DIR)'#010+
+  '        @$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)'#010+
   '        @$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)'#010+
-  '        @$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAM','E)'#010+
+  '        @$(ECHO)  DIST_ZIPNAME......... $(DIS','T_ZIPNAME)'#010+
   '        @$(ECHO)'#010+
   #010+
   '[localmakefile]'#010+
@@ -1287,7 +1288,7 @@ const fpcmakeini : array[0..118,1..240] of char=(
   '#####################################################################'#010+
   #010+
   'ifneq ($(wildcard fpcmake.loc),)'#010+
-  'include fpcm','ake.loc'#010+
+  'incl','ude fpcmake.loc'#010+
   'endif'#010+
   #010+
   '[userrules]'#010+

utils/fpcm/fpcmake.ini

@@ -890,8 +890,8 @@ fpc_debug:
         $(EXECPPAS)
 
 # Search paths for .ppu and .pp and .pas
-vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCDIR)
-vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCDIR)
+vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
+vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)