Browse Source

* Makefile fixes for prt0 prt0_10

marco 25 years ago
parent
commit
1963501fcd
2 changed files with 12 additions and 14 deletions
  1. 8 9
      rtl/freebsd/Makefile
  2. 4 5
      rtl/freebsd/Makefile.fpc

+ 8 - 9
rtl/freebsd/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/10/19]
 #
 
 defaultrule: all
@@ -124,8 +124,10 @@ UNITPREFIX=rtl
 
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 SYSTEMUNIT=system
+PRT0=prt0
 else
 SYSTEMUNIT=sysbsd
+PRT0=prt0_10
 endif
 
 # Paths
@@ -428,10 +430,10 @@ endif
 export TARPROG
 
 ifeq ($(USETAR),bz2)
-TAROPT=vI
+TAROPT=vyf
 TAREXT=.tar.bz2
 else
-TAROPT=vz
+TAROPT=vzf
 TAREXT=.tar.gz
 endif
 
@@ -1117,7 +1119,7 @@ else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef USETAR
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT)
-	cd $(PACKDIR) ; $(TARPROG) cf$(TAROPT) $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT) * ; cd $(BASEDIR)
+	cd $(PACKDIR) ; $(TARPROG) c$(TAROPT) $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT) * ; cd $(BASEDIR)
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT)
 	cd $(PACKDIR) ; $(ZIPPROG) -Dr $(ZIPOPT) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT) * ; cd $(BASEDIR)
@@ -1277,15 +1279,12 @@ vpath %$(PASEXT) $(INC) $(PROCINC) $(UNIXINC)
 # Loaders
 #
 
-prt0$(OEXT) : $(CPU_TARGET)/prt0.as
-	$(AS) -o prt0$(OEXT) $(CPU_TARGET)/prt0.as
+prt0$(OEXT) : $(CPU_TARGET)/$(PRT0).as
+	$(AS) -o prt0$(OEXT) $(CPU_TARGET)/$(PRT0).as
 
 cprt0$(OEXT) : $(CPU_TARGET)/cprt0.as
 	$(AS) -o cprt0$(OEXT) $(CPU_TARGET)/cprt0.as
 
-
-
-
 #
 # System Units (System, Objpas, Strings)
 #

+ 4 - 5
rtl/freebsd/Makefile.fpc

@@ -47,8 +47,10 @@ UNITPREFIX=rtl
 
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 SYSTEMUNIT=system
+PRT0=prt0
 else
 SYSTEMUNIT=sysbsd
+PRT0=prt0_10
 endif
 
 # Paths
@@ -89,15 +91,12 @@ vpath %$(PASEXT) $(INC) $(PROCINC) $(UNIXINC)
 # Loaders
 #
 
-prt0$(OEXT) : $(CPU_TARGET)/prt0.as
-        $(AS) -o prt0$(OEXT) $(CPU_TARGET)/prt0.as
+prt0$(OEXT) : $(CPU_TARGET)/$(PRT0).as
+        $(AS) -o prt0$(OEXT) $(CPU_TARGET)/$(PRT0).as
 
 cprt0$(OEXT) : $(CPU_TARGET)/cprt0.as
         $(AS) -o cprt0$(OEXT) $(CPU_TARGET)/cprt0.as
 
-
-
-
 #
 # System Units (System, Objpas, Strings)
 #