Skip to content

Commit fc4ad0c

Browse files
committed
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)
1 parent 0cb0f26 commit fc4ad0c

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/Makefile.am

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -441,6 +441,7 @@ clean-local:
441441
-$(MAKE) -C univalue clean
442442
-rm -f leveldb/*/*.gcda leveldb/*/*.gcno leveldb/helpers/memenv/*.gcda leveldb/helpers/memenv/*.gcno
443443
-rm -f config.h
444+
-rm -rf test/__pycache__
444445

445446
.rc.o:
446447
@test -f $(WINDRES)

src/Makefile.qt.include

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -400,9 +400,10 @@ translate: qt/bitcoinstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_CPP)
400400

401401
$(QT_QRC_LOCALE_CPP): $(QT_QRC_LOCALE) $(QT_QM)
402402
@test -f $(RCC)
403-
@test -f $(@D)/$(<F) || cp -f $< $(@D)
404-
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin_locale $(@D)/$(<F) | \
403+
@cp -f $< $(@D)/temp_$(<F)
404+
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin_locale $(@D)/temp_$(<F) | \
405405
$(SED) -e '/^\*\*.*Created:/d' -e '/^\*\*.*by:/d' > $@
406+
@rm $(@D)/temp_$(<F)
406407

407408
$(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES) $(PROTOBUF_H)
408409
@test -f $(RCC)

0 commit comments

Comments
 (0)