more defensive coding :P

git-svn-id: svn://svn.icculus.org/netradiant/trunk@182 61c419a2-8eb2-4b30-bcec-8cead039b335
This commit is contained in:
divverent 2009-02-08 19:40:15 +00:00
parent 3aca84b7e5
commit 85e72d11b3

View File

@ -144,6 +144,8 @@ endif
endif endif
endif endif
INSTALLDIR_BASE := $(INSTALLDIR)
ifeq ($(OS),Linux) ifeq ($(OS),Linux)
CPPFLAGS_COMMON += -DPOSIX -DXWINDOWS CPPFLAGS_COMMON += -DPOSIX -DXWINDOWS
CFLAGS_COMMON += -fPIC CFLAGS_COMMON += -fPIC
@ -191,7 +193,6 @@ ifeq ($(OS),Darwin)
# workaround: we have no "ldd" for OS X, so... # workaround: we have no "ldd" for OS X, so...
LDD = LDD =
INSTALLDIR_BASE := $(INSTALLDIR)
INSTALLDIR := $(INSTALLDIR_BASE)/NetRadiant.app/Contents/MacOS/install INSTALLDIR := $(INSTALLDIR_BASE)/NetRadiant.app/Contents/MacOS/install
else else
@ -325,8 +326,7 @@ binaries: \
.PHONY: clean .PHONY: clean
clean: clean:
$(RM_R) $(INSTALLDIR)/ $(RM_R) $(INSTALLDIR_BASE)/
[ "$(OS)" != "Darwin" ] || $(RM_R) $(INSTALLDIR_BASE)/
$(FIND) . \( -name \*.o -o -name \*.d -o -name \*.$(DLL) -o -name \*.$(A) -o -name \*.$(EXE) \) -exec $(RM) {} \; $(FIND) . \( -name \*.o -o -name \*.d -o -name \*.$(DLL) -o -name \*.$(A) -o -name \*.$(EXE) \) -exec $(RM) {} \;
$(RM) icons/*.rc $(RM) icons/*.rc