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

make: Replace some executables by absolute paths to improve performance

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2017-09-02 19:26:52 +00:00
commit f5c43f706a
54 changed files with 134 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

33
make/defs.mk
View file

@ -29,19 +29,23 @@ ifneq ($(wildcard pre-local.mk),)
endif
# ----- executables
SED = sed
CAT = /bin/cat
SED := /usr/bin/sed
CAT := /bin/cat
SHELL ?= /bin/bash
BROWSER ?= firefox
RM := /usr/bin/rm
AR = /usr/bin/ar
PWD := /usr/bin/pwd
BIN_INSTALL := /usr/bin/install
# ----- standard variables
CVSTOPDIR ?= $(CVS_PROJ_DIR)/..
ifeq ($(PROJECT),)
PROJECT := $(patsubst $(FLAVOUR_PREFIX)%,%,$(notdir $(shell cd $(TOPDIR); pwd | $(SED) 's/.*\///; s/-[0-9].*//')))
PROJECT := $(patsubst $(FLAVOUR_PREFIX)%,%,$(notdir $(shell cd $(TOPDIR); $(PWD) | $(SED) 's/.*\///; s/-[0-9].*//')))
endif
OS ?= $(shell sh $(MOD_SCRIPT_DIR)/get-os.sh)
OS ?= $(shell /bin/bash $(MOD_SCRIPT_DIR)/get-os.sh)
CREATE_DEVEL ?= true
#COMPILER_SUITE ?= clang
@ -112,7 +116,7 @@ CVS_RSH ?= /usr/bin/ssh
# ----- input dirs
JW_BUILD_DIR = $(MODDIR)
PROJECT_STEM = $(PROJECT)-$(DIST_VERSION)
CVS_ROOT_DIR = $(shell test -d CVS && pwd | $(SED) -e "s%`$(CAT) CVS/Repository`%%; s%/$$%%")
CVS_ROOT_DIR = $(shell test -d CVS && $(PWD) | $(SED) -e "s%`$(CAT) CVS/Repository`%%; s%/$$%%")
REV_SUBDIRS = $(shell echo $(SUBDIRS) | awk '{for (i=NF; i>=1; i--) printf ("%s ",$$i)}')
FRESH_CVSDIR = $(HOME)/local/src/cvs.fresh
IMAGE_DIR ?= $(CVS_ROOT_DIR)/images
@ -161,7 +165,7 @@ endif
JANWARE_USER ?= $(shell id -un)
JANWARE_CLIENT ?= jw
JANWARE_WIKI ?= $(JANWARE_CLIENT)
JANWARE_URL_DOC_MODULE ?= https///janware.com/wiki/$(JANWARE_WIKI)/assets/types/data/sw/$(PROJECT)/$(notdir $(shell pwd))
JANWARE_URL_DOC_MODULE ?= https///janware.com/wiki/$(JANWARE_WIKI)/assets/types/data/sw/$(PROJECT)/$(notdir $(shell $(PWD)))
JANWARE_URL_DOC_PROJECT ?= https///janware.com/wiki/$(JANWARE_WIKI)/assets/types/data/sw/$(PROJECT)/$(PROJECT)
PKG_VENDOR ?= janware GmbH
@ -476,7 +480,7 @@ INSTALLED_CGI += $(addprefix $(INSTALL_CGIDIR)/,$(EXE_CGI))
INSTALLATION_FILE_TYPES += HTML
BUILD_HTMLDIR = $(TOPDIR)/htdocs
LOCAL_HTML += $(filter-out $(DONT_INSTALL),$(wildcard *.html *.css *.php *.js) $(IMAGES))
HTML_SUBDIR ?= $(shell pwd | $(SED) '/.*\/htdocs\(\/\|$$\)/!d; s%.*/htdocs\(/\|$$\)%%')
HTML_SUBDIR ?= $(shell $(PWD) | $(SED) '/.*\/htdocs\(\/\|$$\)/!d; s%.*/htdocs\(/\|$$\)%%')
ifeq ($(HTML_SUBDIR),)
INSTALL_HTMLDIR = $(PROJECT_HTMLDIR)
else
@ -488,7 +492,7 @@ INSTALLED_HTML += $(addprefix $(INSTALL_HTMLDIR)/,$(LOCAL_HTML))
INSTALLATION_FILE_TYPES += TMPL
BUILD_TMPLDIR = $(TOPDIR)/tmpl
LOCAL_TMPL += $(filter-out $(DONT_INSTALL) Makefile,$(wildcard *.tmpl))
TMPL_SUBDIR ?= $(shell pwd | $(SED) '/.*\/tmpl\(\/\|$$\)/!d; s%.*/tmpl\(/\|$$\)%%')
TMPL_SUBDIR ?= $(shell $(PWD) | $(SED) '/.*\/tmpl\(\/\|$$\)/!d; s%.*/tmpl\(/\|$$\)%%')
ifeq ($(TMPL_SUBDIR),)
INSTALL_TMPLDIR = $(PROJECT_TMPLDIR)
else
@ -680,8 +684,6 @@ endif
# do a conditional include of timer headers, yet
GENERATE_FUNC_TIMERS = $(MODDIR)/YStopWatchThreadList/generate_func_timers.sh
RM = rm
AR = ar
PKG_SH_EXE = /bin/bash $(MOD_SCRIPT_DIR)/pkg.sh
LOG_INSTALL_SH = $(PKG_SH_EXE) log-install
@ -741,7 +743,7 @@ else
endif
define install_links
cwd=`pwd`; \
cwd=`$(PWD)`; \
echo "o in $(INSTALL_$(1)DIR):" ;\
for f in $(notdir $(INSTALLED_$(1))); do \
cd $(INSTALL_$(1)DIR); \
@ -974,14 +976,7 @@ ifeq ($(STRIP_SYMBOLS),true)
STRIP_DONE ?= strip.done
endif
INCLUDE += $(LOCAL_INCLUDE)
# force use of double quotes, allow header namespaces
ifeq ($(HDRDIR_SCOPE_SUFFIX),)
INCLUDE += -I.
else
INCLUDE += -iquote .
endif
INCLUDE += $(LOCAL_INCLUDE) -I.
ifeq ($(USE_PROJECT_LIB),true)
INCLUDE += $(PROJECT_INCLUDE) -I$(TOPDIR)/include