From 0e3a59a23d00d8ef18287bedb68b296f330d988b Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 7 Dec 2016 13:30:06 +0000 Subject: [PATCH] topdir.mk: Fix for JANWARE_USER not equal id -un, untested Signed-off-by: Jan Lindemann --- make/topdir.mk | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/make/topdir.mk b/make/topdir.mk index 3494c84f..730fd5a5 100644 --- a/make/topdir.mk +++ b/make/topdir.mk @@ -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)