janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 03:53:32 +01:00
Code Activity

topdir.mk: Fix for JANWARE_USER not equal id -un, untested

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2016-12-07 13:30:06 +00:00
commit 0e3a59a23d
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
make/topdir.mk
View file

@ -10,7 +10,6 @@ SUBDIRS ?= $(wildcard inst/pre make scripts contrib src libsrc \
images doc test inst/post)
PROJECT_DESCR = $(TOPDIR)/make/project.conf
GIT_DESCR = $(TOPDIR)/.git/description
WHOAMI = $(shell whoami)
OPT_JANWARE_PROJECT ?= -j
@ -21,15 +20,15 @@ OPT_JANWARE_PROJECT =
REMOTE_GIT_FLAVOUR ?= priv
endif
REMOTE_GIT_DIR = /srv/git/$(WHOAMI)/$(REMOTE_GIT_FLAVOUR)/$(RPM_PROJECT)
REMOTE_GIT_URL = ssh://$(WHOAMI)@git.jannet.de$(REMOTE_GIT_DIR)
ifneq ($(wildcard $(TOPDIR)/make/defs.mk),)
include $(TOPDIR)/make/defs.mk
endif
include $(MODDIR)/make/defs.mk
REMOTE_GIT_DIR = /srv/git/$(JANWARE_USER)/$(REMOTE_GIT_FLAVOUR)/$(RPM_PROJECT)
REMOTE_GIT_URL = ssh://$(JANWARE_USER)@git.jannet.de$(REMOTE_GIT_DIR)
include $(MODDIR)/make/dirs.mk
include $(MODDIR)/make/rpmdist.mk
include $(MODDIR)/make/rules.mk
@ -108,7 +107,7 @@ git-init-from-cvs: git-init
git-config:
git config --global user.name "$(FULL_NAME)"
git config --global user.email $(WHOAMI)@janware.com
git config --global user.email $(JANWARE_USER)@janware.com
git remote add origin $(REMOTE_GIT_URL)
git remote set-url --push origin $(REMOTE_GIT_URL)