From: divverent Date: Sun, 8 Feb 2009 19:40:15 +0000 (+0000) Subject: more defensive coding :P X-Git-Tag: svn-r421~238 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=85e72d11b3051ef6f29d5dbc0cf89f9c4d43f4e2;p=xonotic%2Fnetradiant.git more defensive coding :P git-svn-id: svn://svn.icculus.org/netradiant/trunk@182 61c419a2-8eb2-4b30-bcec-8cead039b335 --- diff --git a/Makefile b/Makefile index b9aa6e5c..c89da777 100644 --- a/Makefile +++ b/Makefile @@ -144,6 +144,8 @@ endif endif endif +INSTALLDIR_BASE := $(INSTALLDIR) + ifeq ($(OS),Linux) CPPFLAGS_COMMON += -DPOSIX -DXWINDOWS CFLAGS_COMMON += -fPIC @@ -191,7 +193,6 @@ ifeq ($(OS),Darwin) # workaround: we have no "ldd" for OS X, so... LDD = - INSTALLDIR_BASE := $(INSTALLDIR) INSTALLDIR := $(INSTALLDIR_BASE)/NetRadiant.app/Contents/MacOS/install else @@ -325,8 +326,7 @@ binaries: \ .PHONY: clean clean: - $(RM_R) $(INSTALLDIR)/ - [ "$(OS)" != "Darwin" ] || $(RM_R) $(INSTALLDIR_BASE)/ + $(RM_R) $(INSTALLDIR_BASE)/ $(FIND) . \( -name \*.o -o -name \*.d -o -name \*.$(DLL) -o -name \*.$(A) -o -name \*.$(EXE) \) -exec $(RM) {} \; $(RM) icons/*.rc