From 6f037b93826fecad608880d85f583496d57b21b8 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Fri, 13 Jun 2014 13:38:14 +0000 Subject: [PATCH] defs.mk, proj.mk, upload-defs-rpm.mk: Simplified upload variable definitions Signed-off-by: Jan Lindemann --- make/defs.mk | 4 ---- make/proj.mk | 13 +------------ make/upload-defs-rpm.mk | 4 +++- 3 files changed, 4 insertions(+), 17 deletions(-) diff --git a/make/defs.mk b/make/defs.mk index 8e5b5bee..16570b41 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -253,10 +253,6 @@ ALL_C += $(LOCAL_C) $(PREREQ_CPP) ALL_CPP += $(LOCAL_CPP) $(PREREQ_CPP) ALL_CSRC += $(LOCAL_CSRC) $(PREREQ_CSRC) -FTP_PCKG_DIR = /pub/packages -JANNET_PROJ_DIR = rsync_ssh://ftp.jannet.de:/srv/ftp$(FTP_PCKG_DIR) -UPLOAD_URL_RPM_BIN = rsync_ssh://ftp.jannet.de:/srv/ftp/pub/packages/rpm/bin/ -UPLOAD_URL_RPM_SRC = rsync_ssh://ftp.jannet.de:/srv/ftp/pub/packages/rpm/src/ PUBLIC_PATH_DEVEL_DOC = /proj/devel-docs UPLOAD_URL_DEVEL_DOC = rsync_ssh://root@feitnix.jannet.de:/srv/www/htdocs/jannet.de_443/$(PUBLIC_PATH_DEVEL_DOC) diff --git a/make/proj.mk b/make/proj.mk index ac33247f..f3476391 100644 --- a/make/proj.mk +++ b/make/proj.mk @@ -25,23 +25,12 @@ REQUIRED = inst/pre \ lib include bin \ inst/post -#VERSION = @PACKAGE_VERSION@ -#VERSION_STR = \"@PACKAGE_VERSION@\" -#DEVELOPMENT = @IS_DEVELOPMENT_VERSION@ - -# rpmdist.mk variables -MKSPEC_SH = $(MOD_SCRIPT_DIR)/mkspec_wrapper.sh $(TOPDIR)/make/mkspec.sh +# rpmdist.mk variable overrides 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_FILE_MODE = 644 FTP_DIR_MODE = 755 -#FTP_HOST = ftp.jannet.de -FTP_HOST_LOGIN = root ifeq ($(DEVELOPMENT),true) include $(TOPDIR)/make/cfg_dev.mk diff --git a/make/upload-defs-rpm.mk b/make/upload-defs-rpm.mk index 5994dd4d..abd4ea3e 100644 --- a/make/upload-defs-rpm.mk +++ b/make/upload-defs-rpm.mk @@ -3,7 +3,8 @@ # VERSION # MOD_SCRIPT_DIR -UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh +UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh +MKSPEC_SH = $(MOD_SCRIPT_DIR)/mkspec_wrapper.sh $(TOPDIR)/make/mkspec.sh FTP_FILE_MODE ?= 640 FTP_DIR_MODE ?= 750 @@ -16,6 +17,7 @@ FTP_DEV_USER ?= $(shell whoami) FTP_HOST ?= ftp.jannet.de FTP_HOST_LOGIN ?= root +FTP_PCKG_DIR = /pub/packages PCKG_ROOT = $(FTP_PCKG_DIR)/$(RPM_PROJECT) CURRENT_SRC = $(PCKG_ROOT)/src/$(PCKG_TAR) CURRENT_RPM_RUN_I386 = $(PCKG_ROOT)/rpm/run/$(PCKG_RPM_RUN_I386)