aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Raetz <fabian.raetz@gmail.com>2014-05-02 21:32:12 +0200
committerFabian Raetz <fabian.raetz@gmail.com>2014-05-02 21:32:12 +0200
commitdbe8f7526266092fe7b045dadaefb753feca15a6 (patch)
treec5ff2067fb0f3c82d5df4db8beda5905655c3c06
parent3e7dac9dadb4cb45d2a6771d208c920b667c289b (diff)
downloadbitcoin-dbe8f7526266092fe7b045dadaefb753feca15a6.tar.xz
don't use sed's -i option to stay posix compliant
POSIX does not define sed's -i option. To stay as portable as possible we should not relay on it.
-rw-r--r--src/Makefile.include12
-rw-r--r--src/qt/Makefile.am4
2 files changed, 8 insertions, 8 deletions
diff --git a/src/Makefile.include b/src/Makefile.include
index 01b47d1aa0..2fc6cd7775 100644
--- a/src/Makefile.include
+++ b/src/Makefile.include
@@ -40,18 +40,18 @@ $(LIBBITCOINQT):
ui_%.h: %.ui
@test -d $(abs_builddir)/$(@D) || $(MKDIR_P) $(abs_builddir)/$(@D)
@test -f $(UIC) && QT_SELECT=$(QT_SELECT) $(UIC) -o $(abs_builddir)/$@ $(abs_srcdir)/$< || echo error: could not build $(abs_builddir)/$@
- $(SED) -i.bak -e '/^\*\*.*Created:/d' $(abs_builddir)/$@ && rm $(abs_builddir)/$@.bak
- $(SED) -i.bak -e '/^\*\*.*by:/d' $(abs_builddir)/$@ && rm $(abs_builddir)/$@.bak
+ $(SED) -e '/^\*\*.*Created:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@{.n,}
+ $(SED) -e '/^\*\*.*by:/d' $(abs_builddir)/$@ > $(abs_builddir)/$@.n && mv $(abs_builddir)/$@{.n,}
%.moc: %.cpp
QT_SELECT=$(QT_SELECT) $(MOC) $(QT_INCLUDES) $(MOC_DEFS) -o $@ $<
- $(SED) -i.bak -e '/^\*\*.*Created:/d' $@ && rm $@.bak
- $(SED) -i.bak -e '/^\*\*.*by:/d' $@ && rm $@.bak
+ $(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@{.n,}
+ $(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@{.n,}
moc_%.cpp: %.h
QT_SELECT=$(QT_SELECT) $(MOC) $(QT_INCLUDES) $(MOC_DEFS) -o $@ $<
- $(SED) -i.bak -e '/^\*\*.*Created:/d' $@ && rm $@.bak
- $(SED) -i.bak -e '/^\*\*.*by:/d' $@ && rm $@.bak
+ $(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@{.n,}
+ $(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@{.n,}
%.qm: %.ts
@test -d $(abs_builddir)/$(@D) || $(MKDIR_P) $(abs_builddir)/$(@D)
diff --git a/src/qt/Makefile.am b/src/qt/Makefile.am
index 44d2964501..8ec1ae2583 100644
--- a/src/qt/Makefile.am
+++ b/src/qt/Makefile.am
@@ -372,7 +372,7 @@ translate: bitcoinstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_CPP) $(
$(QT_QRC_CPP): $(QT_QRC) $(QT_QM) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES) $(PROTOBUF_H)
@cd $(abs_srcdir); test -f $(RCC) && QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin -o $(abs_builddir)/$@ $< || \
echo error: could not build $@
- $(SED) -i.bak -e '/^\*\*.*Created:/d' $@ && rm $@.bak
- $(SED) -i.bak -e '/^\*\*.*by:/d' $@ && rm $@.bak
+ $(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@{.n,}
+ $(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@{.n,}
CLEANFILES = $(BUILT_SOURCES) $(QT_QM) $(QT_FORMS_H) *.gcda *.gcno