mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-15 03:53:32 +01:00
make: Make rpm build and upload work
This commit is contained in:
parent
20c4d34315
commit
54045394c4
5 changed files with 137 additions and 62 deletions
|
|
@ -17,9 +17,9 @@ ifndef PROJECT
|
|||
lock sigsync shmem \
|
||||
usrv uclnt statecheck msgfmt \
|
||||
YMisc YError \
|
||||
YThread YMutex YCbContr \
|
||||
YThread YMutex YEvent YCbContr \
|
||||
YTimeB YStopWatch YStopWatchList YStopWatchQueue YStopWatchThreadList \
|
||||
lib
|
||||
lib include
|
||||
endif
|
||||
|
||||
LIBNAME := $(PROJECT)
|
||||
|
|
@ -39,6 +39,9 @@ LOCAL_DIST_WINVERSION = $(shell echo $(LOCAL_WINVERSION) | sed -e "s/-dev//")
|
|||
DEVELOPMENT = $(shell cat $(TOPDIR)/VERSION | grep 'dev' >/dev/null && echo true)
|
||||
PROJECT_STEM = $(PROJECT)-$(DIST_VERSION)
|
||||
|
||||
FTP_PCKG_DIR = /pub/packages
|
||||
JANNET_PROJ_DIR = rsync_ssh://ftp.jannet.de:/usr/local/ftp$(FTP_PCKG_DIR)
|
||||
|
||||
ifeq ($(DEVELOPMENT),true)
|
||||
include $(TOPDIR)/make/cfg_dev.mk
|
||||
else
|
||||
|
|
@ -184,7 +187,14 @@ CC = $(YAMD)gcc
|
|||
CPP = $(YAMD)g++
|
||||
RM = rm
|
||||
AR = ar
|
||||
INSTALL = install
|
||||
ifdef INSTALL_LOG
|
||||
INSTALL=$(MODDIR)/devutil/scripts/log_install.sh -l $(INSTALL_LOG)
|
||||
else
|
||||
ifndef INSTALL
|
||||
INSTALL = install
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
define make_subdirs
|
||||
set -e; for D in $(SUBDIRS) ; do make -C $$D ; done
|
||||
|
|
@ -197,3 +207,7 @@ endef
|
|||
LD_LIBRARY_PATH = $(LIBDIR)
|
||||
export LD_LIBRARY_PATH
|
||||
|
||||
UPLOAD_URL_RPM_BIN=rsync_ssh://ftp.jannet.de:/usr/local/ftp/pub/packages/rpm/bin/
|
||||
UPLOAD_URL_RPM_SRC=rsync_ssh://ftp.jannet.de:/usr/local/ftp/pub/packages/rpm/src/
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue