smedev/common
6
0
Fork 0
mirror of https://src.koozali.org/smeserver/common.git synced 2024-11-22 03:47:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

reverse previous change

Browse Source
This commit is contained in:
Jean-Philippe Pialasse 2024-03-14 16:23:32 -04:00
parent 06f7ee77c3
commit 26cb3351e9
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile.common
View File

@ -21,11 +21,8 @@ HEAD_BRANCH := devel
endif endif
BASEDIR := $(shell basename `pwd`) BASEDIR := $(shell basename `pwd`)
# BRANCH := $(BASEDIR) # BRANCH := $(BASEDIR)
VERG = $(shell [ `/usr/bin/git branch|awk '{print $$2}'` == 'master' ] && echo 11 || echo `/usr/bin/git branch | awk '{print $$2}'`) # Get tag for module - e.g. contribs10 or sme10 from file left by cvs2git conversion script
PREF = $(shell [ `/usr/bin/git config --get remote.origin.url| cut -d/ -f4` == "smecontrib" ] && echo 'contrib' || echo 'sme') BRANCH := $(shell cat contriborbase)
#BRANCH := $(shell cat contriborbase)
BRANCH = "$(PREF)$(VERG)"
$(info $$BRANCH is [${BRANCH}])
BRANCHINFO = $(shell grep ^$(BRANCH): $(COMMON_DIR)/branches | cut -d: --output-delimiter=" " -f2-) BRANCHINFO = $(shell grep ^$(BRANCH): $(COMMON_DIR)/branches | cut -d: --output-delimiter=" " -f2-)
TARGET := $(word 1, $(BRANCHINFO)) TARGET := $(word 1, $(BRANCHINFO))
DIST = $(word 2, $(BRANCHINFO)) DIST = $(word 2, $(BRANCHINFO))
@ -158,7 +155,7 @@ $(shell cat sources 2>/dev/null | while read m f ; do if test "$$f" = "$@" ; the
endef endef
# list the possible targets for valid arches # list the possible targets for valid arches
ARCHES = noarch i386 x86_64 aarch64 # i586 i686 ia64 s390 s390x ppc ppc64 pseries ppc64pseries iseries ppc64iseries athlon alpha alphaev6 sparc sparc64 sparcv9 sparcv9v sparc64v i164 mac sh mips geode ARCHES = noarch i386 i586 i686 x86_64 aarch64 # ia64 s390 s390x ppc ppc64 pseries ppc64pseries iseries ppc64iseries athlon alpha alphaev6 sparc sparc64 sparcv9 sparcv9v sparc64v i164 mac sh mips geode
# for the modules that do different "make prep" depending on what arch we build for # for the modules that do different "make prep" depending on what arch we build for
PREP_ARCHES = $(addprefix prep-,$(ARCHES)) PREP_ARCHES = $(addprefix prep-,$(ARCHES))