janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-24 14:50: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/rules.mk
View file

@ -156,7 +156,7 @@ echo-contrib:
trace-marks:
for f in $(ALL_CPP); do \
sed 's/^{$$/{_/' $$f > $$f.rep ;\
$(SED) 's/^{$$/{_/' $$f > $$f.rep ;\
cp $$f.rep $$f ;\
done
@ -211,7 +211,7 @@ $(LIB_SO): $(VERSION_SCRIPT) $(LIB_A) $(TOPDIR)/dir_build_LIB.done
$(filter-out -l$(LIBNAME),$(LDFLAGS)) -o $@
else
$(WINRES_RC): $(WINRES_RC_TMPL)
cat $< | sed " \
cat $< | $(SED) " \
s/__VER_FILEVERSION__/$(MAJOR_VERSION),$(MINOR_VERSION),$(RELEASE_VERSION),$(BUILD_NUMBER)/; \
s/__VER_FILEVERSION_STR__/$(MAJOR_VERSION).$(MINOR_VERSION).$(RELEASE_VERSION).$(BUILD_NUMBER)/; \
s/__VER_DESCRIPTION__/\"$(PROJECT_DESCR)\"/; \
@ -224,7 +224,7 @@ $(WINRES_O): $(WINRES_RC)
$(LIB_SO): $(VERSION_SCRIPT) $(WINRES_O) $(LIB_A) $(TOPDIR)/dir_build_LIB.done
$(LD) -shared -Wl,--whole-archive,--out-implib,$(shell echo $(LIB_A) | \
sed 's/-static//'),--output-def,$(LIB_DEF) $(VERSION_SCRIPT) $(LIB_A) $(WINRES_O) \
$(SED) 's/-static//'),--output-def,$(LIB_DEF) $(VERSION_SCRIPT) $(LIB_A) $(WINRES_O) \
-Wl,--no-whole-archive $(filter-out -l$(LIBNAME),$(LDFLAGS)) -o $@
$(MSVCPP_IMPLIB): $(LIB_SO)
$(MS_LD) /machine:i386 /def:$(LIB_DEF)
@ -323,7 +323,7 @@ $$(TOPDIR)/dir_build_$(1).done:
touch $$@
$$(BUILD_$(1)DIR)/%: % $$(TOPDIR)/dir_build_$(1).done
@if [ ! $$< -ef $$@ -a "`echo $$< | sed 's/\..*//'`" != local ]; then \
@if [ ! $$< -ef $$@ -a "`echo $$< | $(SED) 's/\..*//'`" != local ]; then \
echo install -m $($(1)MODE) $$< $$@ ;\
install -m $($(1)MODE) $$< $$@ ;\
rm -f $$(TOPDIR)/dirs-*.done ;\
@ -347,7 +347,7 @@ endef
$(foreach type, $(INSTALLATION_FILE_TYPES), $(eval $(call std_install_rules,$(type))))
$(sort $(LINKS_SO)):
cd $(dir $@); ln -sf $(shell echo $@ | sed -e 's/\.so$$\|\.so.*$$//').$(SO_SUFFIX) $(notdir $@)
cd $(dir $@); ln -sf $(shell echo $@ | $(SED) -e 's/\.so$$\|\.so.*$$//').$(SO_SUFFIX) $(notdir $@)
ifeq ($(DEVELOPMENT),true)
install_profile_path:
@ -356,8 +356,8 @@ install_profile_path: $(INSTALLED_PROFILE_PATH_SCRIPT)
endif
$(INSTALLED_PROFILE_PATH_SCRIPT): $(TOPDIR)/profiledir.done
echo "if [ -z \"\$$PATH\" ]; then PATH=$(shell echo $(INSTALL_EXEDIR) | sed -e s%^$(ENV_PREFIX)/%/%)" > path_script.sh
echo "else PATH=\$$PATH:$(shell echo $(INSTALL_EXEDIR) | sed -e s%^$(ENV_PREFIX)/%/%); fi" >> path_script.sh
echo "if [ -z \"\$$PATH\" ]; then PATH=$(shell echo $(INSTALL_EXEDIR) | $(SED) -e s%^$(ENV_PREFIX)/%/%)" > path_script.sh
echo "else PATH=\$$PATH:$(shell echo $(INSTALL_EXEDIR) | $(SED) -e s%^$(ENV_PREFIX)/%/%); fi" >> path_script.sh
$(INSTALL) -o $(PROFILEOWNER) -g $(PROFILEGROUP) -m $(PROFILEMODE) path_script.sh $@
core-pattern: