From 388a7d94947d189569d6a4c07fbb7add4b6796fd Mon Sep 17 00:00:00 2001 From: Manuel Traut Date: Mon, 12 Jan 2015 13:18:51 +0100 Subject: make: restore config and tail files after master build otherwise a rebuild isn't posible Signed-off-by: Manuel Traut --- modules.mk | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'modules.mk') diff --git a/modules.mk b/modules.mk index 947fa48..c506572 100644 --- a/modules.mk +++ b/modules.mk @@ -55,22 +55,18 @@ ifneq ($(filter $(PRES_PREFIX)%,$(obj-y)), ) echo "\input{configmasterpres}" > ../$(MASTER_PRES)_$(BASE_NAME)$(MASTER_END) cat ../$(MASTER_PRES)$(MASTER_END) >> ../$(MASTER_PRES)_$(BASE_NAME)$(MASTER_END) echo "\input{tailmasterpres}" >> ../$(MASTER_PRES)_$(BASE_NAME)$(MASTER_END) - # Only for TESTING dirty hack *********************************** mv $(TOP_DIR)/configpres.tex $(TOP_DIR)/_configpres.tex mv $(TOP_DIR)/tailpres.tex $(TOP_DIR)/_tailpres.tex touch $(TOP_DIR)/configpres.tex touch $(TOP_DIR)/tailpres.tex - # *************************************************************** TEXINPUTS=`pwd`/../..:.:..:$(TEXINPUTS) $(BUILD) ../$(MASTER_PRES)_$(BASE_NAME)$(MASTER_END) + mv $(TOP_DIR)/_configpres.tex $(TOP_DIR)/configpres.tex + mv $(TOP_DIR)/_tailpres.tex $(TOP_DIR)/tailpres.tex ifndef CONFIG_BUILD_FAST_BUILD TEXINPUTS=`pwd`/../..:.:..:$(TEXINPUTS) $(BUILD) ../$(MASTER_PRES)_$(BASE_NAME)$(MASTER_END) TEXINPUTS=`pwd`/../..:.:..:$(TEXINPUTS) $(BUILD) ../$(MASTER_PRES)_$(BASE_NAME)$(MASTER_END) endif - # Only for TESTING dirty hack *********************************** - mv $(TOP_DIR)/_configpres.tex $(TOP_DIR)/configpres.tex - mv $(TOP_DIR)/_tailpres.tex $(TOP_DIR)/tailpres.tex - # *************************************************************** cp $(MASTER_PRES)_$(BASE_NAME).pdf $(DEPLOY)/$(subst tmp_,,$(MASTER_PRES))_$(BASE_NAME).pdf endif -- cgit v1.2.3