* fixes to make ide zip creation working

base/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:47
+# Makefile generated by fpcmake v0.99.13 on 1999-11-26 12:50
 #
 
 defaultrule: info
@@ -929,22 +929,20 @@ info:
 #######################################
 
 compiler_cycle:
-	$(MAKE) -C $(COMPILERDIR) cycle
+	$(MAKE) -C compiler cycle
 
 #######################################
 # IDE
 #######################################
 
-IDEDIR=ide
+ide_gdb:
+	$(MAKE) -C ide gdb
 
-ide_gdb: rtl_all api_all fv_all gdbnt_all
-	$(MAKE) -C $(IDEDIR) gdb
+ide_full:
+	$(MAKE) -C ide full
 
-ide_full: rtl_all api_all fv_all
-	$(MAKE) -C $(IDEDIR) full
-
-ide_fullgdb: rtl_all api_all fv_all gdbint_all
-	$(MAKE) -C $(IDEDIR) fullgdb
+ide_fullgdb:
+	$(MAKE) -C ide fullgdb
 
 
 #######################################
@@ -952,8 +950,8 @@ ide_fullgdb: rtl_all api_all fv_all gdbint_all
 #######################################
 
 base_install:
-	$(INSTALL) base/Makefile $(LIBINSTALLDIR)
-	$(INSTALL) base/makefile.fpc $(LIBINSTALLDIR)
+	$(INSTALL) base/Makefile $(BASEINSTALLDIR)
+	$(INSTALL) base/makefile.fpc $(BASEINSTALLDIR)
 
 demo_install:
 	$(MAKE) -C demo installdemo
@@ -966,11 +964,6 @@ man_install:
 # Packaging targets
 #######################################
 
-ifndef ZIPTARGET
-ZIPTARGET=install
-endif
-
-export ZIPTARGET
 export DESTZIPDIR:=$(BASEDIR)
 
 idezips: clean ide_allzip ide_gdbzip ide_fullzip ide_fullgdbzip
@@ -984,6 +977,7 @@ ide_gdbzip:
 	$(MAKE) ide_gdb
 	$(MAKE) -C ide/text zipinstall ZIPNAME=ide-gdb-$(PACKAGESUFFIX)
 ide_fullzip:
+	$(MAKE) compiler_clean
 	$(MAKE) ide_clean
 	$(MAKE) ide_full
 	$(MAKE) -C ide/text zipinstall ZIPNAME=ide-comp-$(PACKAGESUFFIX)
@@ -993,16 +987,13 @@ ide_fullgdbzip:
 	$(MAKE) -C ide/text zipinstall ZIPNAME=ide-full-$(PACKAGESUFFIX)
 
 fvzip: rtl_clean
-	$(MAKE) rtl_all
 	$(MAKE) -C packages api_clean
-	$(MAKE) -C packages api_all
-	$(MAKE) -C packages api_zipinstall ZIPNAME=fv-$(PACKAGESUFFIX)
 	$(MAKE) -C packages fv_clean
 	$(MAKE) -C packages fv_all
+	$(MAKE) -C packages api_zipinstall ZIPNAME=fv-$(PACKAGESUFFIX)
 	$(MAKE) -C packages fv_zipinstalladd ZIPNAME=fv-$(PACKAGESUFFIX)
 
 gtkzip: rtl_clean
-	$(MAKE) rtl_all
 	$(MAKE) -C packages gtk_clean
 	$(MAKE) -C packages gtk_all
 	$(MAKE) -C packages gtk_zipinstall ZIPNAME=gtk-$(PACKAGESUFFIX)
@@ -1014,12 +1005,9 @@ compilerzip: compiler_clean rtl_clean
 	$(MAKE) rtl_zipinstalladd ZIPNAME=compiler-$(PACKAGESUFFIX)
 
 fclzip: rtl_clean fcl_clean
-	$(MAKE) rtl_all
 	$(MAKE) fcl_all
 	$(MAKE) fcl_zipinstall ZIPNAME=fcl-$(PACKAGESUFFIX)
 
-utilszip: utils_clean rtl_clean
-	$(MAKE) rtl_all
-	$(MAKE) fcl_all
+utilszip: utils_clean rtl_clean fcl_clean
 	$(MAKE) utils_all
 	$(MAKE) utils_zipinstall ZIPNAME=utils-$(PACKAGESUFFIX)

base/Makefile.fpc

@@ -48,22 +48,20 @@ info:
 #######################################
 
 compiler_cycle:
-        $(MAKE) -C $(COMPILERDIR) cycle
+        $(MAKE) -C compiler cycle
 
 #######################################
 # IDE
 #######################################
 
-IDEDIR=ide
+ide_gdb:
+        $(MAKE) -C ide gdb
 
-ide_gdb: rtl_all api_all fv_all gdbnt_all
-        $(MAKE) -C $(IDEDIR) gdb
+ide_full:
+        $(MAKE) -C ide full
 
-ide_full: rtl_all api_all fv_all
-        $(MAKE) -C $(IDEDIR) full
-
-ide_fullgdb: rtl_all api_all fv_all gdbint_all
-        $(MAKE) -C $(IDEDIR) fullgdb
+ide_fullgdb:
+        $(MAKE) -C ide fullgdb
 
 
 #######################################
@@ -71,8 +69,8 @@ ide_fullgdb: rtl_all api_all fv_all gdbint_all
 #######################################
 
 base_install:
-        $(INSTALL) base/Makefile $(LIBINSTALLDIR)
-        $(INSTALL) base/makefile.fpc $(LIBINSTALLDIR)
+        $(INSTALL) base/Makefile $(BASEINSTALLDIR)
+        $(INSTALL) base/makefile.fpc $(BASEINSTALLDIR)
 
 demo_install:
         $(MAKE) -C demo installdemo
@@ -85,11 +83,6 @@ man_install:
 # Packaging targets
 #######################################
 
-ifndef ZIPTARGET
-ZIPTARGET=install
-endif
-
-export ZIPTARGET
 export DESTZIPDIR:=$(BASEDIR)
 
 idezips: clean ide_allzip ide_gdbzip ide_fullzip ide_fullgdbzip
@@ -103,6 +96,7 @@ ide_gdbzip:
         $(MAKE) ide_gdb
         $(MAKE) -C ide/text zipinstall ZIPNAME=ide-gdb-$(PACKAGESUFFIX)
 ide_fullzip:
+        $(MAKE) compiler_clean
         $(MAKE) ide_clean
         $(MAKE) ide_full
         $(MAKE) -C ide/text zipinstall ZIPNAME=ide-comp-$(PACKAGESUFFIX)
@@ -112,16 +106,13 @@ ide_fullgdbzip:
         $(MAKE) -C ide/text zipinstall ZIPNAME=ide-full-$(PACKAGESUFFIX)
 
 fvzip: rtl_clean
-        $(MAKE) rtl_all
         $(MAKE) -C packages api_clean
-        $(MAKE) -C packages api_all
-        $(MAKE) -C packages api_zipinstall ZIPNAME=fv-$(PACKAGESUFFIX)
         $(MAKE) -C packages fv_clean
         $(MAKE) -C packages fv_all
+        $(MAKE) -C packages api_zipinstall ZIPNAME=fv-$(PACKAGESUFFIX)
         $(MAKE) -C packages fv_zipinstalladd ZIPNAME=fv-$(PACKAGESUFFIX)
 
 gtkzip: rtl_clean
-        $(MAKE) rtl_all
         $(MAKE) -C packages gtk_clean
         $(MAKE) -C packages gtk_all
         $(MAKE) -C packages gtk_zipinstall ZIPNAME=gtk-$(PACKAGESUFFIX)
@@ -133,12 +124,10 @@ compilerzip: compiler_clean rtl_clean
         $(MAKE) rtl_zipinstalladd ZIPNAME=compiler-$(PACKAGESUFFIX)
 
 fclzip: rtl_clean fcl_clean
-        $(MAKE) rtl_all
         $(MAKE) fcl_all
         $(MAKE) fcl_zipinstall ZIPNAME=fcl-$(PACKAGESUFFIX)
 
-utilszip: utils_clean rtl_clean
-        $(MAKE) rtl_all
-        $(MAKE) fcl_all
+utilszip: utils_clean rtl_clean fcl_clean
         $(MAKE) utils_all
         $(MAKE) utils_zipinstall ZIPNAME=utils-$(PACKAGESUFFIX)
+

ide/text/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:47
+# Makefile generated by fpcmake v0.99.13 on 1999-11-26 12:51
 #
 
 defaultrule: all
@@ -134,7 +134,6 @@ endif
 # when making a full version include the compiler
 ifeq ($(FULL),1)
 override COMPUNITDIR+=../../compiler
-override NEEDOPT+=-dBrowserCol -dGDB -Sg
 else
 override COMPUNITDIR+=../fake/compiler
 endif
@@ -170,6 +169,7 @@ ZIPTARGET=install
 
 # Defaults
 
+override NEEDOPT=-Sg
 
 # Directories
 
@@ -199,6 +199,12 @@ override NEEDGCCLIB=1
 
 INFOTARGET=fpc_infocfg fpc_infoobjects fpc_infoinstall 
 
+# Post Settings
+
+ifeq ($(FULL),1)
+override NEEDOPT+=-dBrowserCol -dGDB -Sg
+endif
+
 #####################################################################
 # Default Directories
 #####################################################################
@@ -312,6 +318,10 @@ ifneq ($(OS_TARGET),$(OS_SOURCE))
 override FPCOPT+=-T$(OS_TARGET)
 endif
 
+ifdef NEEDOPT
+override FPCOPT+=$(NEEDOPT)
+endif
+
 ifdef RTLDIR
 override FPCOPT+=-Fu$(RTLDIR)
 endif
@@ -1047,10 +1057,10 @@ gdb:
 	$(MAKE) all GDB=1
 
 full:
-	$(MAKE) all FULL=1 NEEDOPT=-Sg
+	$(MAKE) all FULL=1
 
 fullgdb:
-	$(MAKE) all FULL=1 GDB=1 NEEDOPT=-Sg
+	$(MAKE) all FULL=1 GDB=1
 
 # This is necessary because we don't have all units separate in the
 # units targets

ide/text/Makefile.fpc

@@ -17,12 +17,14 @@ packages=api fv gdbint
 [libs]
 libgcc=1
 
+[defaults]
+defaultoptions=-Sg
+
 
 [presettings]
 # when making a full version include the compiler
 ifeq ($(FULL),1)
 override COMPUNITDIR+=../../compiler
-override NEEDOPT+=-dBrowserCol -dGDB -Sg
 else
 override COMPUNITDIR+=../fake/compiler
 endif
@@ -46,6 +48,12 @@ override GDBUNITDIR+=../fake/gdb
 endif
 
 
+[postsettings]
+ifeq ($(FULL),1)
+override NEEDOPT+=-dBrowserCol -dGDB -Sg
+endif
+
+
 [rules]
 .PHONY: gdb full fullgdb clean_compiler
 
@@ -55,10 +63,10 @@ gdb:
         $(MAKE) all GDB=1
 
 full:
-        $(MAKE) all FULL=1 NEEDOPT=-Sg
+        $(MAKE) all FULL=1
 
 fullgdb:
-        $(MAKE) all FULL=1 GDB=1 NEEDOPT=-Sg
+        $(MAKE) all FULL=1 GDB=1
 
 # This is necessary because we don't have all units separate in the
 # units targets