+ Fixed dl unit dependency rule

rtl/linux/Makefile

@@ -1,14 +1,13 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/12/22]
+# Makefile generated by fpcmake v1.00 [2000/12/08]
 #
 
 defaultrule: all
 
 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT or OS/2)
+# Autodetect OS (Linux or Dos or Windows NT)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
-# define inOS2 when running under OS/2
 #####################################################################
 
 # We need only / in the path
@@ -25,7 +24,6 @@ nopwd:
 	@exit
 else
 inUnix=1
-PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@@ -50,25 +48,6 @@ else
 SRCEXEEXT=.exe
 endif
 
-# The extension of batch files / scripts
-ifdef inUnix
-BATCHEXT=.sh
-else
-ifdef inOS2
-BATCHEXT=.cmd
-else
-BATCHEXT=.bat
-endif
-endif
-
-# Path Separator, the subst trick is necessary for the \ that can't exists
-# at the end of a line
-ifdef inUnix
-PATHSEP=/
-else
-PATHSEP=$(subst /,\,/)
-endif
-
 # The path which is searched separated by spaces
 ifdef inUnix
 SEARCHPATH=$(subst :, ,$(PATH))
@@ -367,7 +346,15 @@ LD=ld
 endif
 
 # ppas.bat / ppas.sh
-PPAS=ppas$(BATCHEXT)
+ifdef inUnix
+PPAS=ppas.sh
+else
+ifdef inOS2
+PPAS=ppas.cmd
+else
+PPAS=ppas.bat
+endif
+endif
 
 # ldconfig to rebuild .so cache
 ifdef inUnix
@@ -1102,9 +1089,6 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
-ifeq ($(OS_TARGET),os2)
-PACKAGESUFFIX=emx
-endif
 endif
 
 # Temporary path to pack a file
@@ -1130,48 +1114,18 @@ USETAR=1
 endif
 endif
 
-# Use a wrapper script by default for OS/2
-ifdef inOS2
-USEZIPWRAPPER=1
-endif
-
-# Create commands to create the zip/tar file
-ZIPWRAPPER=$(DESTZIPDIR)/fpczip$(BATCHEXT)
-ZIPCMD_CDPACK:=cd $(subst /,$(PATHSEP),$(PACKDIR))
-ZIPCMD_CDBASE:=cd $(subst /,$(PATHSEP),$(BASEDIR))
-ifdef USETAR
-ZIPDESTFILE:=$(DESTZIPDIR)/$(ZIPNAME)$(TAREXT)
-ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
-else
-ZIPDESTFILE:=$(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT)
-ZIPCMD_ZIP:=$(subst /,$(PATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
-endif
-
 fpc_zipinstall:
 ifndef ZIPNAME
 	@$(ECHO) "Please specify ZIPNAME!"
 	@exit 1
 else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
-	$(DEL) $(ZIPDESTFILE)
+ifdef USETAR
-ifdef USEZIPWRAPPER
+	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT)
-ifneq ($(ECHO),echo)
+	cd $(PACKDIR) ; $(TARPROG) cf$(TAROPT) $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT) * ; cd $(BASEDIR)
-	$(ECHO) "$(ZIPCMD_CDPACK)" > $(ZIPWRAPPER)
-	$(ECHO) "$(ZIPCMD_ZIP)" >> $(ZIPWRAPPER)
-	$(ECHO) "$(ZIPCMD_CDBASE)" >> $(ZIPWRAPPER)
 else
-	$(ECHO) $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)
+	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT)
-	$(ECHO) $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)
+	cd $(PACKDIR) ; $(ZIPPROG) -Dr $(ZIPOPT) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT) * ; cd $(BASEDIR)
-	$(ECHO) $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)
-endif
-ifdef inUnix
-	/bin/sh $(ZIPWRAPPER)
-else
-	$(ZIPWRAPPER)
-endif
-	$(DEL) $(ZIPWRAPPER)
-else
-	$(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)
 endif
 	$(DELTREE) $(PACKDIR)
 endif
@@ -1369,7 +1323,7 @@ linux$(PPUEXT) : linux.pp strings$(PPUEXT) $(INC)/textrec.inc $(INC)/filerec.inc
 
 ports$(PPUEXT) : ports.pp linux$(PPUEXT) objpas$(PPUEXT)
 
-dl$(PPUEXT) : dl.pp
+dl$(PPUEXT) : $(UNIXINC)/dl.pp
 
 dynlibs$(PPUEXT) : $(INC)/dynlibs.pp $(UNIXINC)/dynlibs.inc dl$(PPUEXT) objpas$(PPUEXT)
 

rtl/linux/Makefile.fpc

@@ -137,7 +137,7 @@ linux$(PPUEXT) : linux.pp strings$(PPUEXT) $(INC)/textrec.inc $(INC)/filerec.inc
 
 ports$(PPUEXT) : ports.pp linux$(PPUEXT) objpas$(PPUEXT)
 
-dl$(PPUEXT) : dl.pp
+dl$(PPUEXT) : $(UNIXINC)/dl.pp
 
 dynlibs$(PPUEXT) : $(INC)/dynlibs.pp $(UNIXINC)/dynlibs.inc dl$(PPUEXT) objpas$(PPUEXT)