summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpasky <pasky@openttd.org>2005-03-09 23:59:18 +0000
committerpasky <pasky@openttd.org>2005-03-09 23:59:18 +0000
commite6feb224112ca93c97ba6572b38a8b2361565a6a (patch)
tree267c694bbc51f1eb5275c94acc5172490cd2c68a
parente5121e70d0bc12ec82dba3ba6f114d5137b69fec (diff)
downloadopenttd-e6feb224112ca93c97ba6572b38a8b2361565a6a.tar.xz
(svn r1980) Check $DESTDIR if $DEST_DIR was not set.
-rw-r--r--Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 46af1ccba..0aabb95e0 100644
--- a/Makefile
+++ b/Makefile
@@ -98,6 +98,7 @@
# ordinary users, currently it is only used for the debian
# packaging. This value should only be set when calling `make
# install' and is not saved in Makefile.config
+# (Note that DESTDIR is checked if DEST_DIR is not set.)
#
# STATIC: link statically
# CYGWIN: build in Cygwin environment
@@ -514,6 +515,10 @@ LIBS += -lws2_32 -lwinmm -lgdi32 -ldxguid -lole32 -lstdc++
TTDLDFLAGS += -Wl,--subsystem,windows
endif
+ifndef DEST_DIR
+DEST_DIR = $(DESTDIR)
+endif
+
# sets up the paths for use for make install
ifdef INSTALL
# We use _PREFIXED vars here, so the paths are recalculated every time, and