paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-12 20:33:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ correct installation for demo packages

Browse Source
This commit is contained in:
carl 2002-03-01 18:07:08 +00:00
parent b5936b1588
commit 33861efe8b
4 changed files with 64 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -1,5 +1,5 @@
#
# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/27]
#
default: help
MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@ -108,7 +108,7 @@ ifndef FPC_VERSION
FPC_VERSION:=$(shell $(FPC) -iV)
endif
export FPC FPC_VERSION
unexport CHECKDEPEND ALLDEPENDENCIES
unexport CHECKDEPEND ALL_DEPENDENCIES
ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
ifndef CPU_SOURCE
@ -347,7 +347,6 @@ endif
endif
endif
export INSTALL_PREFIX
export INSTALL_SOURCESUBDIR
ifndef DIST_DESTDIR
DIST_DESTDIR:=$(BASEDIR)
endif
@ -409,7 +408,7 @@ endif
endif
else
ifdef INSTALL_FPCPACKAGE
INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
else
INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
endif
@ -931,7 +930,7 @@ fpc_distinstall: install exampleinstall
.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
ifndef PACKDIR
ifndef inUnix
PACKDIR=$(BASEDIR)/../fpc-pack
PACKDIR=$(BASEDIR)/fpc-pack
else
PACKDIR=/tmp/fpc-pack
endif
@ -1643,7 +1642,10 @@ docsrc:
$(MAKE) fpc_zipinstall ZIPTARGET=docsrcinstall ZIPNAME=docsrc
.PHONY: demozip
demozip:
$(MAKE) -C demo zipsourceinstall ZIPNAME=demo
$(MKDIR) $(PACKDIR)/source/demo
$(COPYTREE) ./demo/* $(PACKDIR)/source/demo
$(MAKE) -C demo demozip ZIPNAME=demo PACKDIR=$(PACKDIR)
$(DELTREE) $(PACKDIR)/source/demo
.PHONY: sourcebase sourcezip
INSTALL_BASESOURCEDIR=$(INSTALL_SOURCEDIR)/..
sourcebase:

5
Makefile.fpc
View File

@ -350,7 +350,10 @@ docsrc:
.PHONY: demozip
demozip:
$(MAKE) -C demo zipsourceinstall ZIPNAME=demo
$(MKDIR) $(PACKDIR)/source/demo
$(COPYTREE) ./demo/* $(PACKDIR)/source/demo
$(MAKE) -C demo demozip ZIPNAME=demo PACKDIR=$(PACKDIR)
$(DELTREE) $(PACKDIR)/source/demo
##########################################################################

35
demo/Makefile
View File

@ -1,5 +1,5 @@
#
# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/27]
#
default: all
MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@ -107,7 +107,7 @@ ifndef FPC_VERSION
FPC_VERSION:=$(shell $(FPC) -iV)
endif
export FPC FPC_VERSION
unexport CHECKDEPEND ALLDEPENDENCIES
unexport CHECKDEPEND ALL_DEPENDENCIES
ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
ifndef CPU_SOURCE
@ -261,7 +261,6 @@ endif
endif
endif
export INSTALL_PREFIX
export INSTALL_SOURCESUBDIR
ifndef DIST_DESTDIR
DIST_DESTDIR:=$(BASEDIR)
endif
@ -323,7 +322,7 @@ endif
endif
else
ifdef INSTALL_FPCPACKAGE
INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
else
INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
endif
@ -845,7 +844,7 @@ fpc_distinstall: install exampleinstall
.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
ifndef PACKDIR
ifndef inUnix
PACKDIR=$(BASEDIR)/../fpc-pack
PACKDIR=$(BASEDIR)/fpc-pack
else
PACKDIR=/tmp/fpc-pack
endif
@ -1361,6 +1360,28 @@ makefiles: fpc_makefiles
ifneq ($(wildcard fpcmake.loc),)
include fpcmake.loc
endif
.PHONY: installexamples
.PHONY: installexamples demozip
installexamples:
$(MAKE) sourceinstall SOURCEINSTALLDIR=$(EXAMPLEINSTALLDIR)
$(MKDIR) $(INSTALL_SOURCEDIR)
$(COPYTREE) * $(INSTALL_SOURCEDIR)
demozip:
$(DEL) $(ZIPDESTFILE)
ifdef USEZIPWRAPPER
ifneq ($(ECHOREDIR),echo)
$(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPER)
$(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER)
$(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPPER)
else
echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)
echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)
echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)
endif
ifdef inUnix
/bin/sh $(ZIPWRAPPER)
else
$(ZIPWRAPPER)
endif
$(DEL) $(ZIPWRAPPER)
else
$(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)
endif

26
demo/Makefile.fpc
View File

@ -21,7 +21,29 @@ fpcpackage=y
# Demo installation for linux
#
.PHONY: installexamples
.PHONY: installexamples demozip
installexamples:
$(MAKE) sourceinstall SOURCEINSTALLDIR=$(EXAMPLEINSTALLDIR)
$(MKDIR) $(INSTALL_SOURCEDIR)
$(COPYTREE) * $(INSTALL_SOURCEDIR)
demozip:
$(DEL) $(ZIPDESTFILE)
ifdef USEZIPWRAPPER
ifneq ($(ECHOREDIR),echo)
$(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPER)
$(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER)
$(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPPER)
else
echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)
echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)
echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)
endif
ifdef inUnix
/bin/sh $(ZIPWRAPPER)
else
$(ZIPWRAPPER)
endif
$(DEL) $(ZIPWRAPPER)
else
$(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)
endif