diff options
| author | truebrain <truebrain@openttd.org> | 2008-09-02 15:34:38 +0000 |
|---|---|---|
| committer | truebrain <truebrain@openttd.org> | 2008-09-02 15:34:38 +0000 |
| commit | ded643450224003ae50e0e0368b34df0a7ded7d7 (patch) | |
| tree | 2903c423381f36b548f25c1713f0e322d68d86bd | |
| parent | c8e8911ef676f503ac5789d3fefac1278cdef971 (diff) | |
| download | openttd-ded643450224003ae50e0e0368b34df0a7ded7d7.tar.xz | |
(svn r14224) -Fix: copy Makefile.bundle too to your working dir, so you don't need to run ./configure in the root of OpenTTD
| -rw-r--r-- | Makefile.bundle.in (renamed from Makefile.bundle) | 0 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | Makefile.msvc | 2 | ||||
| -rw-r--r-- | config.lib | 1 |
4 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.bundle b/Makefile.bundle.in index 85204de84..85204de84 100644 --- a/Makefile.bundle +++ b/Makefile.bundle.in diff --git a/Makefile.in b/Makefile.in index 100b9498f..47fb0f089 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 d6821a905..73be806c5 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 d015145a8..226c21ee9 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 |