mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-24 14:50:38 +01:00
cfg_dev.mk, ytools.mk.in: Move ftp upload data into ytools.mk
This commit is contained in:
parent
edbf2a6289
commit
e1001f6744
2 changed files with 14 additions and 14 deletions
|
|
@ -41,18 +41,6 @@ CONFIG_FILE = $(CONFIG_DIR)/$(PROJECT).cfg
|
||||||
LIBTYPE = static
|
LIBTYPE = static
|
||||||
FTP_PUB_DIR_ABS = $(JANNET_PROJ_DIR)/$(PROJECT)
|
FTP_PUB_DIR_ABS = $(JANNET_PROJ_DIR)/$(PROJECT)
|
||||||
|
|
||||||
# rpmdist.mk variables
|
|
||||||
MKSPEC_SH = $(TOPDIR)/make/mkspec.sh
|
|
||||||
FTP_SRC_GROUP = ytsrc
|
|
||||||
FTP_SRC_USER = jan
|
|
||||||
FTP_RUN_GROUP = ytrun
|
|
||||||
FTP_RUN_USER = jan
|
|
||||||
FTP_DEV_GROUP = ytdev
|
|
||||||
FTP_DEV_USER = jan
|
|
||||||
FTP_HOST = ftp.jannet.de
|
|
||||||
#FTP_HOST = ftp.jannet.de
|
|
||||||
FTP_HOST_LOGIN = root
|
|
||||||
|
|
||||||
# -- debugging options
|
# -- debugging options
|
||||||
|
|
||||||
# for using the dbmalloc lib, before you will need to do:
|
# for using the dbmalloc lib, before you will need to do:
|
||||||
|
|
|
||||||
|
|
@ -24,10 +24,22 @@ REQUIRED = inst/pre \
|
||||||
lib include bin \
|
lib include bin \
|
||||||
inst/post
|
inst/post
|
||||||
|
|
||||||
VERSION = @PACKAGE_VERSION@
|
VERSION = @PACKAGE_VERSION@
|
||||||
VERSION_STR = \"@PACKAGE_VERSION@\"
|
VERSION_STR = \"@PACKAGE_VERSION@\"
|
||||||
DEVELOPMENT = @IS_DEVELOPMENT_VERSION@
|
DEVELOPMENT = @IS_DEVELOPMENT_VERSION@
|
||||||
|
|
||||||
|
# rpmdist.mk variables
|
||||||
|
MKSPEC_SH = $(TOPDIR)/make/mkspec.sh
|
||||||
|
FTP_SRC_GROUP = ytsrc
|
||||||
|
FTP_SRC_USER = jan
|
||||||
|
FTP_RUN_GROUP = ytrun
|
||||||
|
FTP_RUN_USER = jan
|
||||||
|
FTP_DEV_GROUP = ytdev
|
||||||
|
FTP_DEV_USER = jan
|
||||||
|
FTP_HOST = ftp.jannet.de
|
||||||
|
#FTP_HOST = ftp.jannet.de
|
||||||
|
FTP_HOST_LOGIN = root
|
||||||
|
|
||||||
ifeq ($(DEVELOPMENT),true)
|
ifeq ($(DEVELOPMENT),true)
|
||||||
include $(TOPDIR)/make/cfg_dev.mk
|
include $(TOPDIR)/make/cfg_dev.mk
|
||||||
else
|
else
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue