janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-23 06:30:38 +01:00
Code Activity

make: Replace sed by $(SED)

Browse source
This commit is contained in:
Jan Lindemann 2012-02-04 10:59:02 +00:00 • committed by Jan Lindemann
commit 9f4e02e618
18 changed files with 80 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

14
make/rpmdist.mk
View file

@ -17,13 +17,13 @@ FTP_HOST_LOGIN ?= root
RPM_PROJECT ?= $(PROJECT)
RPM_VERSION ?= $(DIST_VERSION)
LAST_RPM_VERSION_FILE = $(TOPDIR)/LAST_RPM_VERSION$(FLAVOUR_SUFFIX)
LAST_RPM_VERSION ?= $(shell sed 's/-dev$$//' $(LAST_RPM_VERSION_FILE) 2>/dev/null)
LAST_RPM_VERSION ?= $(shell $(SED) 's/-dev$$//' $(LAST_RPM_VERSION_FILE) 2>/dev/null)
RPM_ARCH ?= i586
RPMBUILD ?= rpmbuild
CHECK_CVS_SYNC_BEFORE_RPM_RELEASE ?= true
HASH = $(shell $(cvs_files) | \
grep -v "CHANGES\|VERSION\|HASH\|MD5SUMS\|_RPM_RUN" | \
xargs md5sum | md5sum | sed 's/ .*//')
xargs md5sum | md5sum | $(SED) 's/ .*//')
LOCAL_REPO ?= /srv/ftp/pub/local/packages/suse/11.4
include $(MODDIR)/make/tag-defs.mk
@ -42,9 +42,9 @@ PCKG_RPM_SRC ?= $(RPM_PROJECT)-$(RPM_VERSION).src.rpm
include $(MODDIR)/make/upload-defs-rpm.mk
DIST_FILES = $(shell echo $(REMOTE_TARGETS) | sed 's/\b.*\///g; s/:.*\b//g')
DIST_FILES = $(shell echo $(REMOTE_TARGETS) | $(SED) 's/\b.*\///g; s/:.*\b//g')
GENERATED = $(sort $(shell find . -name '*.in' | \
sed "s/\.in$$//; s%$(DIST_SRC_DIR)%%; s%^[./]*%%"))
$(SED) "s/\.in$$//; s%$(DIST_SRC_DIR)%%; s%^[./]*%%"))
RPMS_DIR = /usr/src/packages/RPMS/$(RPM_ARCH)
SRPMS_DIR = /usr/src/packages/SRPMS
DIST_DIRS = $(DIST_SRC_DIR) $(DIST_PCKG_DIR)
@ -139,7 +139,7 @@ rpmbuild.dist: $(DIST_PCKG_RPM) $(DIST_FILES)
rpminstall.dist: $(DIST_PCKG_RPM)
@set -e; for p in $^; do \
if ! /bin/rpm -q `basename $$p | sed "s/\.$(RPM_ARCH)\.rpm//"` > /dev/null 2>&1 ; then \
if ! /bin/rpm -q `basename $$p | $(SED) "s/\.$(RPM_ARCH)\.rpm//"` > /dev/null 2>&1 ; then \
echo + installing $$p ;\
sudo /bin/rpm -U $$p; \
fi; \
@ -234,7 +234,7 @@ rpm-check-release:
rpm-release: rpm-update-release
@if [ "$(LAST_RPM_VERSION)" != "$(RPM_VERSION)" ]; then \
$(check_cvs_sync) ;\
echo "+ version $(RPM_VERSION) doesn't match latest released rpm version "\
echo "+ version $(RPM_VERSION) doesn't match latest relea$(SED) rpm version "\
"$(LAST_RPM_VERSION), building a new release" ;\
make rpm-clean update-repo.dist || exit 1;\
cp VERSION $(LAST_RPM_VERSION_FILE) ;\
@ -243,6 +243,6 @@ rpm-release: rpm-update-release
fi ;\
cvs commit -m "o `cat $(LAST_RPM_VERSION_FILE)`" $(LAST_RPM_VERSION_FILE) ;\
else \
echo "+ version matches latest released rpm version" ;\
echo "+ version matches latest relea$(SED) rpm version" ;\
fi