mirror of
https://github.com/FirebirdSQL/firebird.git
synced 2025-01-22 21:23:04 +01:00
Fronported CORE-3615: add silent_install target to firebird's Makefile (and some other misc install-related fixes)
This commit is contained in:
parent
a07f19b294
commit
963096063f
@ -431,6 +431,12 @@ cat /etc/inetd.conf |grep -v @FB_SERVICE_NAME@ >/etc/inetd.conf.new
|
||||
mv /etc/services.new /etc/services
|
||||
mv /etc/inetd.conf.new /etc/inetd.conf
|
||||
|
||||
# reset make env
|
||||
FIREBIRD_LOCK=
|
||||
export FIREBIRD_LOCK
|
||||
FIREBIRD=
|
||||
export FIREBIRD
|
||||
|
||||
# add the gds service and restart inetd
|
||||
cat >>/etc/services <<EOF
|
||||
@FB_SERVICE_NAME@ @FB_SERVICE_PORT@/tcp #Firebird Database Remote Protocol
|
||||
|
@ -128,4 +128,4 @@ buildTarDir: buildImageDir
|
||||
(cd $(GEN_ROOT)/buildroot; cp manifest.txt ../$(TarDir)/manifest.txt )
|
||||
|
||||
install: buildTarDir
|
||||
(cd $(GEN_ROOT)/$(TarDir); ./install.sh)
|
||||
(cd $(GEN_ROOT)/$(TarDir); FIREBIRD= FIREBIRD_LOCK= ./install.sh)
|
||||
|
@ -139,5 +139,9 @@ buildTarDir: buildImageDir
|
||||
|
||||
|
||||
install: buildTarDir
|
||||
(cd $(GEN_ROOT)/$(TarDir); FIREBIRD= ./install.sh)
|
||||
(cd $(GEN_ROOT)/$(TarDir); FIREBIRD= FIREBIRD_LOCK= ./install.sh)
|
||||
cp -r $(GEN_ROOT)/$(DebugDir)/* /
|
||||
|
||||
silent_install: buildTarDir
|
||||
(cd $(GEN_ROOT)/$(TarDir); FIREBIRD= FIREBIRD_LOCK= ./install.sh -silent)
|
||||
cp -r $(GEN_ROOT)/$(DebugDir)/* /
|
||||
|
@ -67,5 +67,5 @@ BuildVersion=$(FirebirdVersion).$(BuildNum)
|
||||
Version=$(BuildVersion)-$(PackageVersion)
|
||||
|
||||
install:
|
||||
(cd $(GEN_ROOT)/; ./install/install.netbsd.sh)
|
||||
(cd $(GEN_ROOT)/; FIREBIRD= FIREBIRD_LOCK= ./install/install.netbsd.sh)
|
||||
|
||||
|
@ -499,7 +499,9 @@ Dependencies = $(AllObjects:.o=.d)
|
||||
# create binary packages
|
||||
#
|
||||
|
||||
install install-embedded package packages dist:
|
||||
.PHONY: install silent_install install-embedded package packages dist
|
||||
|
||||
install install-embedded silent_install package packages dist:
|
||||
$(MAKE) -f Makefile.install $@
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user