浏览代码

+ Corrections so install and compiles correct

michael 25 年之前
父节点
当前提交
f36280316d
共有 2 个文件被更改,包括 7 次插入36 次删除
  1. 4 33
      fcl/db/interbase/Makefile
  2. 3 3
      fcl/db/interbase/Makefile.fpc

+ 4 - 33
fcl/db/interbase/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/11/01]
+# Makefile generated by fpcmake v1.00 [2000/12/08]
 #
 
 defaultrule: all
@@ -184,7 +184,8 @@ override EXAMPLEOBJECTS+=testib
 
 # Install
 
-PACKAGENAME=interbase
+UNITSUBDIR=fcl
+PACKAGENAME=fcl
 ZIPTARGET=install
 
 # Defaults
@@ -199,7 +200,7 @@ endif
 
 # Packages
 
-override PACKAGES+=rtl fcl ibase
+override PACKAGES+=rtl ibase
 
 # Libraries
 
@@ -504,7 +505,6 @@ endif
 # PACKAGESDIR packages
 
 PACKAGERTL=1
-PACKAGEFCL=1
 PACKAGEIBASE=1
 
 ifdef PACKAGERTL
@@ -536,35 +536,6 @@ ifdef UNITDIR_RTL
 override NEEDUNITDIR+=$(UNITDIR_RTL)
 endif
 endif
-ifdef PACKAGEFCL
-ifneq ($(wildcard $(FPCDIR)/fcl),)
-ifneq ($(wildcard $(FPCDIR)/fcl/$(OS_TARGET)),)
-PACKAGEDIR_FCL=$(FPCDIR)/fcl/$(OS_TARGET)
-else
-PACKAGEDIR_FCL=$(FPCDIR)/fcl
-endif
-ifeq ($(wildcard $(PACKAGEDIR_FCL)/$(FPCMADE)),)
-override COMPILEPACKAGES+=package_fcl
-package_fcl:
-	$(MAKE) -C $(PACKAGEDIR_FCL) all
-endif
-UNITDIR_FCL=$(PACKAGEDIR_FCL)
-else
-PACKAGEDIR_FCL=
-ifneq ($(wildcard $(UNITSDIR)/fcl),)
-ifneq ($(wildcard $(UNITSDIR)/fcl/$(OS_TARGET)),)
-UNITDIR_FCL=$(UNITSDIR)/fcl/$(OS_TARGET)
-else
-UNITDIR_FCL=$(UNITSDIR)/fcl
-endif
-else
-UNITDIR_FCL=
-endif
-endif
-ifdef UNITDIR_FCL
-override NEEDUNITDIR+=$(UNITDIR_FCL)
-endif
-endif
 ifdef PACKAGEIBASE
 ifneq ($(wildcard $(PACKAGESDIR)/ibase),)
 ifneq ($(wildcard $(PACKAGESDIR)/ibase/$(OS_TARGET)),)

+ 3 - 3
fcl/db/interbase/Makefile.fpc

@@ -7,11 +7,11 @@ examples=testib
 
 [require]
 options=-S2 
-packages=fcl ibase
+packages=ibase
 
 [install]
-unitssubdir=fcl
-packagename=interbase
+unitsubdir=fcl
+packagename=fcl
 
 [dirs]
 fpcdir=../../..