From ded643450224003ae50e0e0368b34df0a7ded7d7 Mon Sep 17 00:00:00 2001 From: truebrain Date: Tue, 2 Sep 2008 15:34:38 +0000 Subject: [PATCH] (svn r14224) -Fix: copy Makefile.bundle too to your working dir, so you don't need to run ./configure in the root of OpenTTD --- Makefile.bundle => Makefile.bundle.in | 0 Makefile.in | 2 +- Makefile.msvc | 2 +- config.lib | 1 + 4 files changed, 3 insertions(+), 2 deletions(-) rename Makefile.bundle => Makefile.bundle.in (100%) diff --git a/Makefile.bundle b/Makefile.bundle.in similarity index 100% rename from Makefile.bundle rename to Makefile.bundle.in diff --git a/Makefile.in b/Makefile.in index 100b9498f8..47fb0f0897 100644 --- a/Makefile.in +++ b/Makefile.in @@ -113,7 +113,7 @@ mrproper: rm -f $$dir/Makefile; \ done $(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 $(CONFIG_CACHE_SOURCE_LIST) config.cache config.log $(Q)rm -rf $(BUNDLE_DIR) diff --git a/Makefile.msvc b/Makefile.msvc index d6821a905e..73be806c50 100644 --- a/Makefile.msvc +++ b/Makefile.msvc @@ -25,4 +25,4 @@ TARGET := $(shell echo $(PLATFORM) | sed "s/win64/x64/;s/win32/Win32/") all: $(Q)cp objs/$(TARGET)/Release/$(TTD) $(BIN_DIR)/$(TTD) -include Makefile.bundle +include Makefile.bundle.in diff --git a/config.lib b/config.lib index d015145a85..226c21ee95 100644 --- a/config.lib +++ b/config.lib @@ -2374,6 +2374,7 @@ generate_main() { # Create the main Makefile echo "Generating 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 >> Makefile.am # Make the copy of the source-list, so we don't trigger an unwanted recompile