diff options
author | Cory Fields <cory-nospam-@coryfields.com> | 2016-06-01 18:06:40 -0400 |
---|---|---|
committer | Cory Fields <cory-nospam-@coryfields.com> | 2016-06-01 20:31:55 -0400 |
commit | fc4ad0c7fcf2e5841756c9d1003f95c879ee5cd2 (patch) | |
tree | f66a8a9b072044519a937b5275540ab9b8a6ea6e | |
parent | 0cb0f2626e1553426e16a52fc6928d35824827f5 (diff) | |
download | bitcoin-fc4ad0c7fcf2e5841756c9d1003f95c879ee5cd2.tar.xz |
build: more out-of-tree fixups
- clear the __pycache__ during 'make clean'
- Copy the qrc locale file to a temp location and remove it when finished
(rcc expects everything to be in the same path)
-rw-r--r-- | src/Makefile.am | 1 | ||||
-rw-r--r-- | src/Makefile.qt.include | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index c833272ff9..5e33c6a869 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -441,6 +441,7 @@ clean-local: -$(MAKE) -C univalue clean -rm -f leveldb/*/*.gcda leveldb/*/*.gcno leveldb/helpers/memenv/*.gcda leveldb/helpers/memenv/*.gcno -rm -f config.h + -rm -rf test/__pycache__ .rc.o: @test -f $(WINDRES) diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 3b39919441..29e3a264cc 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -400,9 +400,10 @@ translate: qt/bitcoinstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_CPP) $(QT_QRC_LOCALE_CPP): $(QT_QRC_LOCALE) $(QT_QM) @test -f $(RCC) - @test -f $(@D)/$(<F) || cp -f $< $(@D) - $(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin_locale $(@D)/$(<F) | \ + @cp -f $< $(@D)/temp_$(<F) + $(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin_locale $(@D)/temp_$(<F) | \ $(SED) -e '/^\*\*.*Created:/d' -e '/^\*\*.*by:/d' > $@ + @rm $(@D)/temp_$(<F) $(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES) $(PROTOBUF_H) @test -f $(RCC) |