diff --git a/Make/makedefs b/Make/makedefs index c252441d6..5703b0f7c 100644 --- a/Make/makedefs +++ b/Make/makedefs @@ -87,7 +87,7 @@ EXE_EXT = DOF = $(OPTF) DEBUGDIR = $(OS)$(ARCH).Debug OPTDIR = $(OS)$(ARCH).Opt -BININST = bin +BININST = bin/$(OS)$(ARCH)/ PLUGININST = lib/$(OS)$(ARCH)/osgPlugins LIBINST = lib/$(OS)$(ARCH) diff --git a/Make/makerules b/Make/makerules index c492d3a92..5524ca44d 100644 --- a/Make/makerules +++ b/Make/makerules @@ -89,7 +89,7 @@ $(EXEC:=.dbg) : $(MAKE) -f ../GNUmakefile "DOF=$(DBGF)" TOPDIR=../${TOPDIR} \ THISDIR=../$(THISDIR)\ MAKEDEPEND=Makedepend $(EXEC) - @$(MAKE) LNSRC=$(DEBUGDIR)/$(EXEC)$(EXE_EXT) LNDEST=$(BININST)/$(OS)$(ARCH)/$(EXEC)$(EXE_EXT) __link + @$(MAKE) LNSRC=$(DEBUGDIR)/$(EXEC)$(EXE_EXT) LNDEST=$(BININST)/$(EXEC)$(EXE_EXT) __link $(LIB:=.dbg) : $(PLUGIN:=.dbg) @[ -d $(DEBUGDIR) ] || mkdir $(DEBUGDIR) @@ -113,7 +113,7 @@ $(EXEC:=.opt) : $(MAKE) -f ../GNUmakefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \ THISDIR=../$(THISDIR)\ MAKEDEPEND=Makedepend $(EXEC) - @$(MAKE) LNSRC=$(OPTDIR)/$(EXEC)$(EXE_EXT) LNDEST=$(BININST)/$(OS)$(ARCH)/$(EXEC)$(EXE_EXT) __link + @$(MAKE) LNSRC=$(OPTDIR)/$(EXEC)$(EXE_EXT) LNDEST=$(BININST)/$(EXEC)$(EXE_EXT) __link $(LIB:=.opt) :