]> git.rm.cloudns.org Git - xonotic/netradiant.git/commitdiff
more defensive coding :P
authordivverent <divverent@61c419a2-8eb2-4b30-bcec-8cead039b335>
Sun, 8 Feb 2009 19:40:15 +0000 (19:40 +0000)
committerdivverent <divverent@61c419a2-8eb2-4b30-bcec-8cead039b335>
Sun, 8 Feb 2009 19:40:15 +0000 (19:40 +0000)
git-svn-id: svn://svn.icculus.org/netradiant/trunk@182 61c419a2-8eb2-4b30-bcec-8cead039b335

Makefile

index b9aa6e5c6ee5e68c650ce80ced003baa6870e8c4..c89da77733a70447cb7e96113bebf00b429e3565 100644 (file)
--- 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