(svn r14224) -Fix: copy Makefile.bundle too to your working dir, so you don't need to run ./configure in the root of OpenTTD

This commit is contained in:
truebrain 2008-09-02 15:34:38 +00:00
parent c8e8911ef6
commit ded6434502
4 changed files with 3 additions and 2 deletions

View File

@ -113,7 +113,7 @@ mrproper:
rm -f $$dir/Makefile; \ rm -f $$dir/Makefile; \
done done
$(Q)rm -rf objs $(Q)rm -rf objs
$(Q)rm -f Makefile Makefile.am $(Q)rm -f Makefile Makefile.am Makefile.bundle
$(Q)rm -f media/openttd.desktop $(Q)rm -f media/openttd.desktop
$(Q)rm -f $(CONFIG_CACHE_SOURCE_LIST) config.cache config.log $(Q)rm -f $(CONFIG_CACHE_SOURCE_LIST) config.cache config.log
$(Q)rm -rf $(BUNDLE_DIR) $(Q)rm -rf $(BUNDLE_DIR)

View File

@ -25,4 +25,4 @@ TARGET := $(shell echo $(PLATFORM) | sed "s/win64/x64/;s/win32/Win32/")
all: all:
$(Q)cp objs/$(TARGET)/Release/$(TTD) $(BIN_DIR)/$(TTD) $(Q)cp objs/$(TARGET)/Release/$(TTD) $(BIN_DIR)/$(TTD)
include Makefile.bundle include Makefile.bundle.in

View File

@ -2374,6 +2374,7 @@ generate_main() {
# Create the main Makefile # Create the main Makefile
echo "Generating Makefile..." echo "Generating Makefile..."
< $ROOT_DIR/Makefile.in sed "$SRC_REPLACE" > Makefile < $ROOT_DIR/Makefile.in sed "$SRC_REPLACE" > Makefile
cp $ROOT_DIR/Makefile.bundle.in Makefile.bundle
echo "# Auto-generated file -- DO NOT EDIT" > Makefile.am echo "# Auto-generated file -- DO NOT EDIT" > Makefile.am
echo >> Makefile.am echo >> Makefile.am
# Make the copy of the source-list, so we don't trigger an unwanted recompile # Make the copy of the source-list, so we don't trigger an unwanted recompile