* zipinstall for linux with .tar.gz

base/Makefile

@@ -18,6 +18,18 @@
 
 MODULES=compiler rtl api fv gdb ide
 
+ifndef RTLDIR
+RTLDIR=rtl
+endif
+
+ifndef FCLDIR
+FCLDIR=fcl
+endif
+
+ifndef GTKDIR
+GTKDIR=gtk
+endif
+
 ifndef APIDIR
 APIDIR=api
 endif
@@ -156,7 +168,7 @@ compiler_sharedinstall:
 # RTL
 #######################################
 
-RTLDIR=rtl/$(OS_TARGET)
+override RTLDIR:=$(RTLDIR)/$(OS_TARGET)
 
 rtl_all:
 	$(MAKE) -C $(RTLDIR) all
@@ -174,6 +186,49 @@ rtl_sharedinstall:
 	$(MAKE) -C $(RTLDIR) sharedlibinstall
 
 
+#######################################
+# FCL
+#######################################
+
+override FCLDIR:=$(FCLDIR)/$(OS_TARGET)
+
+fcl_all: rtl_all
+	$(MAKE) -C $(FCLDIR) all
+
+fcl_clean:
+	$(MAKE) -C $(FCLDIR) clean
+
+fcl_install:
+	$(MAKE) -C $(FCLDIR) install
+
+fcl_staticinstall:
+	$(MAKE) -C $(FCLDIR) staticlibinstall
+
+fcl_sharedinstall:
+	$(MAKE) -C $(FCLDIR) sharedlibinstall
+
+
+#######################################
+# GTK
+#######################################
+
+gtk_all: rtl_all
+	$(MAKE) -C $(GTKDIR) all
+
+gtk_clean:
+	$(MAKE) -C $(GTKDIR) clean
+
+gtk_install:
+	$(MAKE) -C $(GTKDIR) install
+
+gtk_staticinstall:
+	$(MAKE) -C $(GTKDIR) staticlibinstall
+
+gtk_sharedinstall:
+	$(MAKE) -C $(GTKDIR) sharedlibinstall
+
+
+
 #######################################
 # API
 #######################################
@@ -313,14 +368,25 @@ fvzip: rtl_clean api_clean fv_clean
 	$(MAKE) fv_all
 	$(MAKE) -C $(FVDIR) fpc_zipinstalladd ZIPNAME=fv-$(PACKAGESUFFIX)
 
-compilerzip: #compiler_clean rtl_clean
+fclzip: rtl_clean fcl_clean
+	$(MAKE) fcl_all
+	$(MAKE) -C $(FCLDIR) fpc_zipinstall ZIPNAME=fcl-$(PACKAGESUFFIX)
+
+gtkzip: rtl_clean gtk_clean
+	$(MAKE) gtk_all
+	$(MAKE) -C $(GTKDIR) fpc_zipinstall ZIPNAME=gtk-$(PACKAGESUFFIX)
+
+compilerzip: compiler_clean rtl_clean
 	$(MAKE) compiler_all
 	$(MAKE) -C compiler fpc_zipinstall ZIPTARGET=quickinstall ZIPNAME=compiler-$(PACKAGESUFFIX)
 	$(MAKE) -C $(RTLDIR) fpc_zipinstalladd ZIPNAME=compiler-$(PACKAGESUFFIX)
 
 #
 # $Log$
-# Revision 1.10  1999-04-01 22:16:02  peter
+# Revision 1.11  1999-04-08 10:16:16  peter
+#   * zipinstall for linux with .tar.gz
+#
+# Revision 1.10  1999/04/01 22:16:02  peter
 #   * renamed ide zips
 #
 # Revision 1.9  1999/03/18 11:19:31  peter

base/makefile.fpc

@@ -301,10 +301,7 @@ endif
 endif
 
 # ZipProg, you can't use Zip as the var name (PFV)
-ifndef ZIPPROG
+ifndef ZIPPROGNEW
-ifdef inlinux
-export ZIPPROG=tar cvz --file
-else
 ZIPPROG=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
@@ -312,11 +309,8 @@ else
 export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
-endif
 
-ifdef inlinux
+ifndef ZIPEXT
-ZIPEXT=.tar.gz
-else
 ZIPEXT=.zip
 endif
 
@@ -579,7 +573,7 @@ endif
 
 # Linux
 ifeq ($(OS_TARGET),linux)
-PACKAGESUFFIX=lin
+PACKAGESUFFIX=linux
 endif
 
 # Win32
@@ -590,7 +584,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-PACKAGESUFFIX=w32
+PACKAGESUFFIX=win32
 endif
 
 # OS/2
@@ -795,8 +789,10 @@ endif
 
 # Add .zip/.tar.gz extension
 ifdef ZIPNAME
+ifndef inlinux
 override ZIPNAME:=$(ZIPNAME)$(ZIPEXT)
 endif
+endif
 
 # Default target which is call before zipping
 ifndef ZIPTARGET
@@ -810,20 +806,31 @@ ifndef ZIPNAME
 	@exit
 else
 	$(MAKE) $(ZIPTARGET) BASEINSTALLDIR=$(PACKDIR)
-	cd $(PACKDIR)
+ifdef inlinux
-	$(ZIPPROG) $(PACKAGEDIR)/$(ZIPNAME) *
+	gzip -d $(PACKAGEDIR)/$(ZIPNAME).tar.gz
-	cd $(BASEDIR)
+	cd $(PACKDIR) ; tar rv --file $(PACKAGEDIR)/$(ZIPNAME).tar * ; cd $(BASEDIR)
+	gzip $(PACKAGEDIR)/$(ZIPNAME).tar
+else
+	cd $(PACKDIR) ; $(ZIPPROG) $(PACKAGEDIR)/$(ZIPNAME) * ; cd $(BASEDIR)
+endif
 	$(DELTREE) $(PACKDIR)
 endif
 
-# This will remove the zipfile
-fpc_zipinstalldel:
-ifdef ZIPNAME
-	$(DEL) $(PACKAGEDIR)/$(ZIPNAME)
-endif
-
 # First remove the zip and then install
-fpc_zipinstall: fpc_zipinstalldel fpc_zipinstalladd
+fpc_zipinstall:
+ifndef ZIPNAME
+	@$(ECHO) Please specify ZIPNAME!
+	@exit
+else
+	$(DEL) $(PACKAGEDIR)/$(ZIPNAME)
+	$(MAKE) $(ZIPTARGET) BASEINSTALLDIR=$(PACKDIR)
+ifdef inlinux
+	cd $(PACKDIR) ; tar cvz --file $(PACKAGEDIR)/$(ZIPNAME).tar.gz * ; cd $(BASEDIR)
+else
+	cd $(PACKDIR) ; $(ZIPPROG) $(PACKAGEDIR)/$(ZIPNAME) * ; cd $(BASEDIR)
+endif
+	$(DELTREE) $(PACKDIR)
+endif
 
 
 #####################################################################
@@ -962,7 +969,10 @@ endif
 
 #
 # $Log$
-# Revision 1.13  1999-04-01 22:52:28  peter
+# Revision 1.14  1999-04-08 10:16:17  peter
+#   * zipinstall for linux with .tar.gz
+#
+# Revision 1.13  1999/04/01 22:52:28  peter
 #   * don't override pasext if set
 #
 # Revision 1.12  1999/03/29 16:04:58  peter