janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-21 05:47:38 +01:00
Code Activity

make: Replace pwd by $(PWD)

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2017-12-18 13:45:55 +00:00
commit f70465cbd5
17 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/backup.mk
View file

@ -2,7 +2,7 @@ BACKUP_SOURCE ?= .
BACKUP_TARGET ?= .. BACKUP_TARGET ?= ..
BACKUP_DATE ?= $(shell date +'%y%m%d-%H%M%S') BACKUP_DATE ?= $(shell date +'%y%m%d-%H%M%S')
_BACKUP_SOURCE = $(notdir $(shell cd $(BACKUP_SOURCE); pwd)) _BACKUP_SOURCE = $(notdir $(shell cd $(BACKUP_SOURCE); $(PWD)))
backup: distclean backup: distclean
tar -C .. $(_BACKUP_SOURCE) -cjf $(BACKUP_TARGET)/$(_BACKUP_SOURCE)-$(BACKUP_DATE).tar.bz2 tar -C .. $(_BACKUP_SOURCE) -cjf $(BACKUP_TARGET)/$(_BACKUP_SOURCE)-$(BACKUP_DATE).tar.bz2

2
make/gettext.mk
View file

@ -1,4 +1,4 @@
GETTEXT_LOCALE ?= $(notdir $(shell pwd)) GETTEXT_LOCALE ?= $(notdir $(shell $(PWD)))
include $(MODDIR)/make/defs.mk include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/rules.mk include $(MODDIR)/make/rules.mk

2
make/git-submod.mk
View file

@ -6,7 +6,7 @@
GIT_SRV_ADMIN_SH = ssh $(JANWARE_USER)@git.jannet.de /opt/jw-build/bin/git-srv-admin.sh GIT_SRV_ADMIN_SH = ssh $(JANWARE_USER)@git.jannet.de /opt/jw-build/bin/git-srv-admin.sh
GIT_REPO_URL = ssh://$(JANWARE_USER)@git.jannet.de/srv/git/$(JANWARE_USER)/contrib/$(PROJECT_DIRNAME) GIT_REPO_URL = ssh://$(JANWARE_USER)@git.jannet.de/srv/git/$(JANWARE_USER)/contrib/$(PROJECT_DIRNAME)
SUBMOD_PATH = $(patsubst $(abspath $(TOPDIR))/%,%,$(abspath $(shell pwd)/$(SUBMOD_SRC_DIR))) SUBMOD_PATH = $(patsubst $(abspath $(TOPDIR))/%,%,$(abspath $(shell $(PWD))/$(SUBMOD_SRC_DIR)))
SUBMOD_SRC_DIR ?= . SUBMOD_SRC_DIR ?= .
SUB_GIT = git -C $(SUBMOD_SRC_DIR) SUB_GIT = git -C $(SUBMOD_SRC_DIR)

2
make/lib.mk
View file

@ -53,7 +53,7 @@ echo.libs:
@echo INSTALLED_LIB = $(INSTALLED_LIB) @echo INSTALLED_LIB = $(INSTALLED_LIB)
install-links: install-links:
l=$(shell pwd)/$(notdir $(INSTALLED_LIB_SO)) ;\ l=$(shell $(PWD))/$(notdir $(INSTALLED_LIB_SO)) ;\
cd $(dir $(INSTALLED_LIB_SO)) &&\ cd $(dir $(INSTALLED_LIB_SO)) &&\
sudo ln -sf $$l sudo ln -sf $$l
# ------------------------------------------ contrib libraries # ------------------------------------------ contrib libraries

4
make/linux-rpm-build.mk
View file

@ -34,8 +34,8 @@ else
KERNEL_PKG = $(KERNEL_PKG_BASE).bz2 KERNEL_PKG = $(KERNEL_PKG_BASE).bz2
KERNEL_SRC_DIR = linux-$(KERNEL_VERSION) KERNEL_SRC_DIR = linux-$(KERNEL_VERSION)
endif endif
#HOST = $(shell cd ../..; pwd | xargs basename) #HOST = $(shell cd ../..; $(PWD) | xargs basename)
WD := $(shell pwd) WD := $(shell $(PWD))
TAG = $(shell echo V_$(KERNEL_VERSION)_$(RPM_RELEASE) | $(SED) 's/\./_/g') TAG = $(shell echo V_$(KERNEL_VERSION)_$(RPM_RELEASE) | $(SED) 's/\./_/g')
ARCH = $(shell $(RPMBUILD) --showrc | $(SED) '/build arch / !d; s/.*build arch *://; s/ //g') ARCH = $(shell $(RPMBUILD) --showrc | $(SED) '/build arch / !d; s/.*build arch *://; s/ //g')

2
make/linux-rpm.mk
View file

@ -27,7 +27,7 @@ else
KERNEL_PKG = $(KERNEL_PKG_BASE).bz2 KERNEL_PKG = $(KERNEL_PKG_BASE).bz2
KERNEL_SRC_DIR = linux-$(KERNEL_VERSION) KERNEL_SRC_DIR = linux-$(KERNEL_VERSION)
endif endif
WD := $(shell pwd) WD := $(shell $(PWD))
TAG = $(shell echo V_$(KERNEL_VERSION)_$(RPM_RELEASE) | $(SED) 's/\./_/g') TAG = $(shell echo V_$(KERNEL_VERSION)_$(RPM_RELEASE) | $(SED) 's/\./_/g')
ARCH = $(shell $(RPMBUILD) --showrc | $(SED) '/build arch / !d; s/.*build arch *://; s/ //g') ARCH = $(shell $(RPMBUILD) --showrc | $(SED) '/build arch / !d; s/.*build arch *://; s/ //g')

4
make/plugin-defs.mk
View file

@ -1,7 +1,7 @@
IS_PLUGIN = true IS_PLUGIN = true
USE_PLUGIN_VERSION_LIB ?= true USE_PLUGIN_VERSION_LIB ?= true
PLUGIN_API ?= $(notdir $(shell cd ..; pwd)) PLUGIN_API ?= $(notdir $(shell cd ..; $(PWD)))
PLUGIN_NAME ?= $(notdir $(shell pwd)) PLUGIN_NAME ?= $(notdir $(shell $(PWD)))
PLUGIN_PREFIX ?= feedfs PLUGIN_PREFIX ?= feedfs
ifneq ($(TARGET),mingw) ifneq ($(TARGET),mingw)

4
make/py-defs.mk
View file

@ -18,8 +18,8 @@ PY_SRC_PY ?= $(wildcard *.py)
PY_ALL_PY = $(sort $(PY_SRC_PY) __init__.py) PY_ALL_PY = $(sort $(PY_SRC_PY) __init__.py)
PY_PYC = $(patsubst %.py,%.pyc,$(PY_ALL_PY)) PY_PYC = $(patsubst %.py,%.pyc,$(PY_ALL_PY))
PY_INSTALL_PKG_MOD ?= $(shell pwd | sed 's%.*/python/%%; s%/.*%%') PY_INSTALL_PKG_MOD ?= $(shell $(PWD) | sed 's%.*/python/%%; s%/.*%%')
PY_INSTALL_SUB_MOD ?= $(shell pwd | sed "s%.*/$(PY_INSTALL_PKG_MOD)\(/\|$$\)%%") PY_INSTALL_SUB_MOD ?= $(shell $(PWD) | sed "s%.*/$(PY_INSTALL_PKG_MOD)\(/\|$$\)%%")
ifneq ($(PY_INSTALL_SUB_MOD),) ifneq ($(PY_INSTALL_SUB_MOD),)
PY_INSTALL_MOD ?= $(PY_INSTALL_PKG_MOD)/$(PY_INSTALL_SUB_MOD) PY_INSTALL_MOD ?= $(PY_INSTALL_PKG_MOD)/$(PY_INSTALL_SUB_MOD)
else else

2
make/python-cli.mk
View file

@ -1,6 +1,6 @@
include $(MODDIR)/make/defs.mk include $(MODDIR)/make/defs.mk
EXE ?= $(shell pwd).py EXE ?= $(shell $(PWD)).py
EXE_PATH ?= ./$(EXE) EXE_PATH ?= ./$(EXE)
all: all:

2
make/qt-pro.mk
View file

@ -1,5 +1,5 @@
QMAKE_MAKEFILE = Makefile.qt QMAKE_MAKEFILE = Makefile.qt
EXE ?= $(notdir $(shell pwd)) EXE ?= $(notdir $(shell $(PWD)))
QMAKE = qmake-qt5 QMAKE = qmake-qt5
all: all:

4
make/run.mk
View file

@ -3,13 +3,13 @@
# contact@jannet.de # contact@jannet.de
# $Id$ # $Id$
DIR_BASENAME = $(notdir $(shell pwd)) DIR_BASENAME = $(notdir $(shell $(PWD)))
ifeq ($(EXE_BASENAME),) ifeq ($(EXE_BASENAME),)
ifneq ($(DIR_BASENAME),test) ifneq ($(DIR_BASENAME),test)
EXE_BASENAME = $(DIR_BASENAME) EXE_BASENAME = $(DIR_BASENAME)
else else
EXE_BASENAME = test-$(notdir $(shell cd ..; pwd)) EXE_BASENAME = test-$(notdir $(shell cd ..; $(PWD)))
endif endif
endif endif

8
make/scripts-targets.mk
View file

@ -11,22 +11,22 @@ endif
HOME_BIN_EXE_SH = $(addprefix $(HOME)/bin/, $(notdir $(EXE_SH))) HOME_BIN_EXE_SH = $(addprefix $(HOME)/bin/, $(notdir $(EXE_SH)))
$(HOME)/bin/%.py: %.py $(HOME)/bin/%.py: %.py
echo -e "#!/bin/bash\nexec /usr/bin/python $(shell pwd)/$<" '"$$@"' > $@.tmp echo -e "#!/bin/bash\nexec /usr/bin/python $(shell $(PWD))/$<" '"$$@"' > $@.tmp
chmod 755 $@.tmp chmod 755 $@.tmp
mv $@.tmp $@ mv $@.tmp $@
$(HOME)/bin/%.pl: %.pl $(HOME)/bin/%.pl: %.pl
echo -e "#!/bin/bash\nexec /usr/bin/perl $(shell pwd)/$<" '"$$@"' > $@.tmp echo -e "#!/bin/bash\nexec /usr/bin/perl $(shell $(PWD))/$<" '"$$@"' > $@.tmp
chmod 755 $@.tmp chmod 755 $@.tmp
mv $@.tmp $@ mv $@.tmp $@
$(HOME)/bin/%.sh: %.sh $(HOME)/bin/%.sh: %.sh
echo -e "#!/bin/bash\n. $(shell pwd)/$<" '"$$@"' > $@.tmp echo -e "#!/bin/bash\n. $(shell $(PWD))/$<" '"$$@"' > $@.tmp
chmod 755 $@.tmp chmod 755 $@.tmp
mv $@.tmp $@ mv $@.tmp $@
$(HOME)/bin/%: % $(HOME)/bin/%: %
echo -e "#!/bin/bash\n. $(shell pwd)/$<" '"$$@"' > $@.tmp echo -e "#!/bin/bash\n. $(shell $(PWD))/$<" '"$$@"' > $@.tmp
chmod 755 $@.tmp chmod 755 $@.tmp
mv $@.tmp $@ mv $@.tmp $@

2
make/standalone-exe.mk
View file

@ -11,7 +11,7 @@ DEVELOPMENT ?= true
CVS_PROJ_DIR := $(dir $(lastword $(MAKEFILE_LIST)))/../.. CVS_PROJ_DIR := $(dir $(lastword $(MAKEFILE_LIST)))/../..
ifeq ($(PROJECT),) ifeq ($(PROJECT),)
PROJECT = $(notdir $(shell pwd)) PROJECT = $(notdir $(shell $(PWD)))
endif endif
ifeq ($(PREFIX),) ifeq ($(PREFIX),)

2
make/test-exe.mk
View file

@ -3,7 +3,7 @@
# contact@jannet.de # contact@jannet.de
# $Id$ # $Id$
EXE_BASENAME ?= test-$(notdir $(shell pwd)) EXE_BASENAME ?= test-$(notdir $(shell $(PWD)))
include $(MODDIR)/make/run.mk include $(MODDIR)/make/run.mk

4
make/tex.mk
View file

@ -6,7 +6,7 @@
# -- project data # -- project data
CUSTOMER ?= jannet CUSTOMER ?= jannet
PROJECT ?= legal PROJECT ?= legal
TOPIC ?= $(notdir $(shell pwd)) TOPIC ?= $(notdir $(shell $(PWD)))
VERSION ?= $(shell sed "s/-dev$$//" VERSION) VERSION ?= $(shell sed "s/-dev$$//" VERSION)
AUTHORS ?= AUTHORS ?=
#TITLE ?= Allgemeine Bedingungen für #TITLE ?= Allgemeine Bedingungen für
@ -124,7 +124,7 @@ HTML_WARN_DONT_EDIT = "\
| process! |\n\ | process! |\n\
+---------------------------------------------------+\n\ +---------------------------------------------------+\n\
-->" -->"
WD = `pwd` WD = $(shell $(PWD))
IMAGES = $(patsubst %,$(IMAGEDIR)/%,$(FRONTLOGO_EPS) $(FRONTLOGO_WEB) $(FRONTLOGO_PDF) \ IMAGES = $(patsubst %,$(IMAGEDIR)/%,$(FRONTLOGO_EPS) $(FRONTLOGO_WEB) $(FRONTLOGO_PDF) \
$(ICON_UP) $(ICON_PREV) $(ICON_NEXT) $(ICON_INDEX) $(ICON_CONTENTS)) \ $(ICON_UP) $(ICON_PREV) $(ICON_NEXT) $(ICON_INDEX) $(ICON_CONTENTS)) \

2
make/textest.mk
View file

@ -3,7 +3,7 @@ PDF_VIEWER ?= $(firstword $(shell which okular acroread))
PNG_VIEWER ?= $(firstword $(shell which qiv gimp)) PNG_VIEWER ?= $(firstword $(shell which qiv gimp))
MAIN_TEX ?= $(firstword $(wildcard main.tex *.tex)) MAIN_TEX ?= $(firstword $(wildcard main.tex *.tex))
MAIN ?= $(patsubst %.tex,$(MAIN_TEX)) MAIN ?= $(patsubst %.tex,$(MAIN_TEX))
OUT_PDF ?= $(notdir $(shell pwd)).pdf OUT_PDF ?= $(notdir $(shell $(PWD))).pdf
OUT_PNG ?= $(patsubst %.pdf,%.png,$(OUT_PDF)) OUT_PNG ?= $(patsubst %.pdf,%.png,$(OUT_PDF))
PNG_WIDTH ?= 200 PNG_WIDTH ?= 200

2
make/topdir.mk
View file

@ -59,7 +59,7 @@ topdir.mrproper:
topdir.install: prefix.done $(INSTALLED_TOPDIR_FILES) topdir.install: prefix.done $(INSTALLED_TOPDIR_FILES)
do-install-links: do-install-links:
@@cwd=`pwd`; \ @@cwd=$(shell $(PWD)); \
echo "o in $(INSTALL_LIBDIR):" ;\ echo "o in $(INSTALL_LIBDIR):" ;\
find lib -name '*.so' -o -name '*.so.*' -o -name '*.a' -o -name '*.dll' | \ find lib -name '*.so' -o -name '*.so.*' -o -name '*.a' -o -name '*.dll' | \
$(SED) 's%^\./%%' | \ $(SED) 's%^\./%%' | \