diff --git a/make/autoconf.mk b/make/autoconf.mk index e21ce97c..5b776e69 100644 --- a/make/autoconf.mk +++ b/make/autoconf.mk @@ -24,7 +24,7 @@ confclean: rm -rf $(DISTCLEAN) $(CLEAN) $(AC_FILES) autom4te.cache configure.ac: configure.ac.tmpl VERSION - cat $< | $(SED) -e "s/_VERSION_/`cat VERSION | $(SED) 's/-dev//'`/" > $@ + $(CAT) $< | $(SED) -e "s/_VERSION_/`$(CAT) VERSION | $(SED) 's/-dev//'`/" > $@ configure: configure.ac autoconf $< > $@ diff --git a/make/defs.mk b/make/defs.mk index bebb0727..3e9970e9 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -32,6 +32,7 @@ endif # ----- executables SED = /usr/bin/sed +CAT = /bin/cat PROJECT_DESCR_FILE ?= $(wildcard $(TOPDIR)/doc/share/project.txt) PROJECT ?= $(patsubst $(FLAVOUR_PREFIX)%,%,$(notdir $(shell cd $(TOPDIR); pwd | $(SED) 's/.*\///; s/-[0-9].*//'))) @@ -41,7 +42,7 @@ PROJECT_DESCR ?= No description CUSTOMER ?= jannet VERSION_FILE ?= $(firstword $(wildcard VERSION $(TOPDIR)/VERSION)) -VERSION ?= $(shell cat $(VERSION_FILE)) +VERSION ?= $(shell $(CAT) $(VERSION_FILE)) DIST_VERSION ?= $(shell $(SED) -e "s/-dev//" $(VERSION_FILE)) HEX_VERSION = $(shell echo $(DIST_VERSION) | \ $(SED) 's/-dev//; s/pre[^\.]*//; s/F[^\.]//; s/[\.-]/ /g' | xargs printf "0x%02x%02x%02x%02x") @@ -74,7 +75,7 @@ MOD_SCRIPT_DIR ?= $(firstword $(wildcard $(MODDIR)/devutil/scripts $(MODD endif YTOOLS_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 @@ -545,13 +546,13 @@ define beautify_lib_path $(SED) 's/:/\n + /g' endef -#$(shell cat $1/VERSION | $(SED) 's/-dev//; s/-[^-]*$$//') -define cat_version -$(shell cat $1/VERSION | $(SED) 's/-dev//') +#$(shell $(CAT) $1/VERSION | $(SED) 's/-dev//; s/-[^-]*$$//') +define $(CAT)_version +$(shell $(CAT) $1/VERSION | $(SED) 's/-dev//') endef define version -$(shell cat $1/VERSION | $(SED) 's/-.*//') +$(shell $(CAT) $1/VERSION | $(SED) 's/-.*//') endef define install_links diff --git a/make/dist.mk b/make/dist.mk index 245c1687..e411ecfa 100644 --- a/make/dist.mk +++ b/make/dist.mk @@ -35,7 +35,7 @@ $(SSI_PREFIX)%.html: $(TMPHTML) $(SSI_DOWNLOAD_TMPL) SIZE=`ls -l $(DIST_FILE) | awk '{print $$5}'`;\ FILENAME=`basename $(DIST_FILE)` ;\ URLDIR=`echo $(DOWNLOAD_URLDIR) | $(SED) -e 's/\\//\\\\\//g;'` ;\ - cat $(SSI_DOWNLOAD_TMPL) | $(SED) -e "\ + $(CAT) $(SSI_DOWNLOAD_TMPL) | $(SED) -e "\ s/_VERSION_/$(LOCAL_DIST_VERSION)/g;\ s/_PROJECT_/$(LOCAL_PROJECT)/g;\ s/_TARGET_STEM_//g;\ diff --git a/make/isolinux.mk b/make/isolinux.mk index 91ef7791..d2fd2d8b 100644 --- a/make/isolinux.mk +++ b/make/isolinux.mk @@ -2,7 +2,7 @@ URL_BASE = http://www.kernel.org/pub/linux/utils/boot/syslinux URL_FILE = SYSLINUX_URL -URL = $(shell cat $(URL_FILE)) +URL = $(shell $(CAT) $(URL_FILE)) DLOAD_DIR = /home/samba/dat/share/exe/linux/syslinux BUILD_DIR = cd_root DIRS = $(DLOAD_DIR) $(BUILD_DIR) @@ -45,7 +45,7 @@ $(URL_FILE): mv $@.tmp $@ dload.done: $(URL_FILE) - wget -c $(shell cat $<) -P $(DLOAD_DIR) + wget -c $(shell $(CAT) $<) -P $(DLOAD_DIR) touch $@ $(MENU_32): unpack.done diff --git a/make/linux-rpm-build.mk b/make/linux-rpm-build.mk index eeaa5e71..2edae024 100644 --- a/make/linux-rpm-build.mk +++ b/make/linux-rpm-build.mk @@ -1,9 +1,9 @@ # abbreviations define EXTRAVERSION -$(shell cat EXTRAVERSION) +$(shell $(CAT) EXTRAVERSION) endef define COMPLETE_VERSION -$(shell cat COMPLETE_VERSION) +$(shell $(CAT) COMPLETE_VERSION) endef HOST ?= $(HOSTNAME) diff --git a/make/linux-rpm.mk b/make/linux-rpm.mk index 30b9802e..757fa1c5 100644 --- a/make/linux-rpm.mk +++ b/make/linux-rpm.mk @@ -1,9 +1,9 @@ define EXTRAVERSION -$(shell cat EXTRAVERSION) +$(shell $(CAT) EXTRAVERSION) endef define COMPLETE_VERSION -$(shell cat COMPLETE_VERSION) +$(shell $(CAT) COMPLETE_VERSION) endef KERNEL_MAJOR = $(shell echo $(KERNEL_VERSION) | cut -d\. -f1) diff --git a/make/rpmdist.mk b/make/rpmdist.mk index c0ea1729..8b6fce4d 100644 --- a/make/rpmdist.mk +++ b/make/rpmdist.mk @@ -171,7 +171,7 @@ define check_cvs_sync cvs update -dP ;\ cvs status > cvs_status.tmp 2>&1 ;\ if [ $$? != 0 ]; then \ - cat cvs_status.tmp ;\ + $(CAT) cvs_status.tmp ;\ echo -e "\n======== cvs status failed, giving up." >&2 ;\ exit 1 ;\ fi ;\ @@ -216,7 +216,7 @@ try-reinstall: $(check_reinstall_old) rpm-update-release: - @if [ "`cat HASH`" != "$(HASH)" ]; then \ + @if [ "`$(CAT) HASH`" != "$(HASH)" ]; then \ echo + source was modified ;\ $(increase_build_number) ;\ elif ! $(check_reinstall_old); then \ @@ -225,7 +225,7 @@ rpm-update-release: fi rpm-check-release: - @if [ "`cat HASH`" != "$(HASH)" ]; then \ + @if [ "`$(CAT) HASH`" != "$(HASH)" ]; then \ echo + source was modified ;\ else \ echo + source is unmodified ;\ @@ -241,7 +241,7 @@ rpm-release: rpm-update-release if ! grep -q $(LAST_RPM_VERSION_FILE) CVS/Entries; then \ cvs add $(LAST_RPM_VERSION_FILE) ;\ fi ;\ - cvs commit -m "o `cat $(LAST_RPM_VERSION_FILE)`" $(LAST_RPM_VERSION_FILE) ;\ + cvs commit -m "o `$(CAT) $(LAST_RPM_VERSION_FILE)`" $(LAST_RPM_VERSION_FILE) ;\ else \ echo "+ version matches latest relea$(SED) rpm version" ;\ fi diff --git a/make/rules.mk b/make/rules.mk index 98c83f4a..d465bcec 100644 --- a/make/rules.mk +++ b/make/rules.mk @@ -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)\"/; \ @@ -281,7 +281,7 @@ INSTALLATION_FILE_TYPES += LIB HDR EXE INIT DOC PROFILE MAKE CFG \ #$(foreach attr,OWNER GROUP MODE,$(foreach type, $(INSTALLATION_FILE_TYPES),\ # $(eval $(call std_install_rules,$(type)$(attr))))) -# --- special installation rules, that the general rules below dont catch +# --- special installation rules, that the general rules below doesn't catch # for whatever reason > %: %.init cp $< $@ diff --git a/make/run.mk b/make/run.mk index 78d798d9..34793f82 100644 --- a/make/run.mk +++ b/make/run.mk @@ -75,11 +75,11 @@ supp.tmp: valgrind --gen-suppressions=all $(EXE_PATH) $(EXE_ARGS) 2>$@.tmp; mv $@.tmp $@ || exit 0 vg-create-supp: supp.tmp - cat $< | $(MOD_SCRIPT_DIR)/parse-valgrind-suppressions.sh > local.supp + $(CAT) $< | $(MOD_SCRIPT_DIR)/parse-valgrind-suppressions.sh > local.supp rm -f supp.tmp vg-add-supp: - cat | $(MOD_SCRIPT_DIR)/parse-valgrind-suppressions.sh >> local.supp + $(CAT) | $(MOD_SCRIPT_DIR)/parse-valgrind-suppressions.sh >> local.supp vg-clean-supp: rm -f local.supp diff --git a/make/smart-selection.mk b/make/smart-selection.mk index 4be69ce9..8fd3dcb9 100644 --- a/make/smart-selection.mk +++ b/make/smart-selection.mk @@ -57,7 +57,7 @@ smart-update.done: touch $@ %-packages.txt-install: smart-update.done - cat $*-packages.txt | xargs sudo smart install -y + $(CAT) $*-packages.txt | xargs sudo smart install -y %-channels.txt-replace: sudo smart channel -y --remove-all diff --git a/make/test-exe.mk b/make/test-exe.mk index 2cf5fdf2..ede77e47 100644 --- a/make/test-exe.mk +++ b/make/test-exe.mk @@ -12,7 +12,7 @@ clean: testclean test.done: if ! 2>&1 make run > test.out 2>&1; then \ - cat test.out; \ + $(CAT) test.out; \ exit 1; \ fi touch $@ diff --git a/make/tex.mk b/make/tex.mk index 02bf9aa7..56bb18c6 100644 --- a/make/tex.mk +++ b/make/tex.mk @@ -95,7 +95,7 @@ define mangle_tmpl @echo "+ generating $< -> $@" @if [ $(suffix $@) = tex ]; then echo -e $(TEX_WARN_DONT_EDIT) > $@; fi @if [ $(suffix $@) = html ]; then echo -e $(HTML_WARN_DONT_EDIT) > $@; fi - cat $< | $(SED) -e "\ + $(CAT) $< | $(SED) -e "\ s%__DATE__%$(DATE)%g; \ s%__AUTHORS__%$(AUTHORS)%g; \ s%__CONTACT_EMAIL__%$(CONTACT_EMAIL)%g; \ @@ -264,8 +264,8 @@ $(HTMLDIR): $(LATEX_INPUT) $(HTML_INPUT) latex $(TEX4HT_FIRST_LATEX_LINE) $(MAIN) tex4ht $(MAIN) t4ht -d$(HTMLDIR) $(MAIN) - #cat index_head.html $(MAIN.html) index_tail.html > index.html - cat $(MAIN.html) > index.html + #$(CAT) index_head.html $(MAIN.html) index_tail.html > index.html + $(CAT) $(MAIN.html) > index.html mv *.html *.css $(HTMLDIR) mkdir -p $(addprefix $(HTMLDIR)/,$(sort $(dir $(shell $(CMD_PARSE_GRAPHICS))))) for g in $(sort $(shell $(CMD_PARSE_GRAPHICS))); do cp $$g $(HTMLDIR)/$$g; done diff --git a/make/upload.mk b/make/upload.mk index 4d18431d..581a0584 100644 --- a/make/upload.mk +++ b/make/upload.mk @@ -13,7 +13,7 @@ UPLOAD_MODULE_PATH ?= $(UPLOAD_TEST_PREFIX)proj/$(UPLOAD_MODULE) UPLOAD_FILE_ROOT ?= $(UPLOAD_VHOST_ROOT)/$(UPLOAD_MODULE_PATH) UPLOAD_TARGET_PREFIX ?= rsync_ssh://$(UPLOAD_HOST_LOGIN)@$(UPLOAD_HOST):$(UPLOAD_FILE_ROOT)/ UPLOAD_LAST_VERSION_FILE ?= LAST_UPLOADED_VERSION -UPLOAD_LAST_VERSION ?= $(shell cat $(UPLOAD_LAST_VERSION_FILE) 2>/dev/null) +UPLOAD_LAST_VERSION ?= $(shell $(CAT) $(UPLOAD_LAST_VERSION_FILE) 2>/dev/null) #UPLOAD_FILES ?= REMOTE_TARGETS ?= \ $(foreach f,$(UPLOAD_FILES),$(UPLOAD_TARGET_PREFIX)$f:$(UPLOAD_FILE_MODE):$(UPLOAD_DIR_MODE):$(UPLOAD_USER).$(UPLOAD_GROUP)) diff --git a/make/zip-windows-files.mk b/make/zip-windows-files.mk index 75eaa764..4d61c06b 100644 --- a/make/zip-windows-files.mk +++ b/make/zip-windows-files.mk @@ -15,14 +15,14 @@ $(WINLIB): $(REQUIRED_H) cp tools/*.h $(LIBPCKGTMPDIR)/include cp $(SHARED_INCLUDE)/*.h $(LIBPCKGTMPDIR)/include cp $(WINLIB) $(LIBPCKGTMPDIR)/lib - cat test/dsprout/win32/dsprout.dsp | . scripts/distify_vcpp_dsp.sh ../.. > $(LIBPCKGTMPDIR)/test/console/dsprot.dsp + $(CAT) test/dsprout/win32/dsprout.dsp | . scripts/distify_vcpp_dsp.sh ../.. > $(LIBPCKGTMPDIR)/test/console/dsprot.dsp cp test/dsprout/*.cpp $(LIBPCKGTMPDIR)/test/console cp test/minicc/qt/*.cpp test/minicc/qt/*.h $(LIBPCKGTMPDIR)/test/minicc/qt - cat test/minicc/qt/win32/miniccqt.dsp | . scripts/distify_vcpp_dsp.sh ../../.. > $(LIBPCKGTMPDIR)/test/minicc/qt/miniccqt.dsp + $(CAT) test/minicc/qt/win32/miniccqt.dsp | . scripts/distify_vcpp_dsp.sh ../../.. > $(LIBPCKGTMPDIR)/test/minicc/qt/miniccqt.dsp echo $(DIST_VERSION) > $(LIBPCKGTMPDIR)/version.txt - cat CHANGES > $(LIBPCKGTMPDIR)/changes.txt - cat COPYING > $(LIBPCKGTMPDIR)/copying.txt - cat LGPL > $(LIBPCKGTMPDIR)/lgpl.txt + $(CAT) CHANGES > $(LIBPCKGTMPDIR)/changes.txt + $(CAT) COPYING > $(LIBPCKGTMPDIR)/copying.txt + $(CAT) LGPL > $(LIBPCKGTMPDIR)/lgpl.txt cd $(LIBPCKGTMPDIR)/..; zip -r `basename $@` `basename $(LIBPCKGTMPDIR)` mv $(LIBPCKGTMPDIR)/../`basename $@` $(LIBPCKGDIR)