doc fixes

[xonotic/netradiant.git] / Makefile

diff --git a/Makefile b/Makefile
index 111e2eb283f9de80f9d3d1a6f36e3ee5dcd06080..bb2f743c7e766672425ec614fc6b01484e9ec6b1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -50,8 +50,9 @@ WGET               ?= wget
 MV                 ?= mv
 UNZIP              ?= unzip
 
-STDOUT_TO_DEVNULL  ?= >/dev/null
-STDERR_TO_DEVNULL  ?= 2>/dev/null
+FD_TO_DEVNULL      ?= >/dev/null
+STDOUT_TO_DEVNULL  ?= 1$(FD_TO_DEVNULL)
+STDERR_TO_DEVNULL  ?= 2$(FD_TO_DEVNULL)
 STDERR_TO_STDOUT   ?= 2>&1
 TO_DEVNULL         ?= $(STDOUT_TO_DEVNULL) $(STDERR_TO_STDOUT)
 
@@ -77,9 +78,16 @@ LIBS_DL            ?= -ldl # nothing on Win32
 CPPFLAGS_ZLIB      ?=
 LIBS_ZLIB          ?= -lz
 DEPEND_ON_MAKEFILE ?= yes
-DOWNLOAD_GAMEPACKS ?= yes # set to no to disable gamepack, set to all to even download undistributable gamepacks
+DOWNLOAD_GAMEPACKS ?= yes
+# set to no to disable gamepack, set to all to even download undistributable gamepacks
+
+# Support CHECK_DEPENDENCIES with DOWNLOAD_GAMEPACKS semantics
+ifneq ($(CHECK_DEPENDENCIES),)
+DEPENDENCIES_CHECK = $(patsubst yes,quiet,$(patsubst no,off,$(CHECK_DEPENDENCIES)))
+else
 DEPENDENCIES_CHECK ?= quiet
 # or: off, verbose
+endif
 
 # these are used on Win32 only
 GTKDIR             ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) gtk+-2.0 --variable=prefix $(STDERR_TO_DEVNULL))
@@ -186,17 +194,14 @@ ifeq ($(OS),Darwin)
        CPPFLAGS_COMMON += -DPOSIX -DXWINDOWS
        CFLAGS_COMMON += -fPIC
        CXXFLAGS_COMMON += -fno-exceptions -fno-rtti
-       CPPFLAGS_COMMON += -I/sw/include -I/usr/X11R6/include
-       LDFLAGS_COMMON += -L/sw/lib  -L/usr/X11R6/lib
-       #LDFLAGS_COMMON += -L/sw/lib -L/usr/lib -L/usr/X11R6/lib
+       CPPFLAGS_COMMON += -I/opt/local/include -I/sw/include -I/usr/X11R6/include
+       LDFLAGS_COMMON += -L/opt/local/lib -L/sw/lib -L/usr/X11R6/lib
        LDFLAGS_DLL += -dynamiclib -ldl
        EXE ?= ppc
-       MACLIBDIR ?= /sw/lib
+       MACLIBDIR ?= /opt/local/lib
        A = a
        DLL = dylib
        MWINDOWS =
-       MACVERSION ?= 16
-       CPPFLAGS_COMMON += -DMACVERSION="$(MACVERSION)"
        # workaround for weird prints
        ECHO_NOLF = /bin/echo -n
 
@@ -246,12 +251,12 @@ dependencies-check:
 else
 dependencies-check:
        @$(ECHO)
-       @if [ x"$(DEPENDENCIES_CHECK)" = x"verbose" ]; then set -x; fi; \
+       @if [ x"$(DEPENDENCIES_CHECK)" = x"verbose" ]; then set -x; exec 3>&2; else exec 3$(FD_TO_DEVNULL); fi; \
        failed=0; \
        checkbinary() \
        { \
                $(ECHO_NOLF) "Checking for $$2 ($$1)... "; \
-               $$2 --help $(TO_DEVNULL); \
+               $$2 --help >&3 $(STDERR_TO_STDOUT); \
                if [ $$? != 127 ]; then \
                        $(ECHO) "found."; \
                else \
@@ -290,14 +295,14 @@ dependencies-check:
        [ -n "$(OTOOL)" ] && checkbinary xcode "$(OTOOL)"; \
        [ "$$failed" = "0" ] && $(ECHO) All required tools have been found!
        @$(ECHO)
-       @if [ x"$(DEPENDENCIES_CHECK)" = x"verbose" ]; then set -x; fi; \
+       @if [ x"$(DEPENDENCIES_CHECK)" = x"verbose" ]; then set -x; exec 3>&2; else exec 3$(FD_TO_DEVNULL); fi; \
        failed=0; \
        checkheader() \
        { \
                $(ECHO_NOLF) "Checking for $$2 ($$1)... "; \
                if \
-                       $(CXX) conftest.cpp $(CFLAGS) $(CXXFLAGS) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) $(CPPFLAGS) $(CPPFLAGS_COMMON) $$4 -DCONFTEST_HEADER="<$$2>" -DCONFTEST_SYMBOL="$$3" $(TARGET_ARCH) $(LDFLAGS) -c -o conftest.o $(TO_DEVNULL) && \
-                       $(CXX) conftest.o $(LDFLAGS) $(LDFLAGS_COMMON) $$5 $(LIBS_COMMON) $(LIBS) -o conftest $(TO_DEVNULL); \
+                       $(CXX) conftest.cpp $(CFLAGS) $(CXXFLAGS) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) $(CPPFLAGS) $(CPPFLAGS_COMMON) $$4 -DCONFTEST_HEADER="<$$2>" -DCONFTEST_SYMBOL="$$3" $(TARGET_ARCH) $(LDFLAGS) -c -o conftest.o >&3 $(STDERR_TO_STDOUT) && \
+                       $(CXX) conftest.o $(LDFLAGS) $(LDFLAGS_COMMON) $$5 $(LIBS_COMMON) $(LIBS) -o conftest >&3 $(STDERR_TO_STDOUT); \
                then \
                        $(RM) conftest conftest.o conftest.d; \
                        $(ECHO) "found."; \