Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Eagar <joeedh@gmail.com>2010-09-04 09:31:25 +0400
committerJoseph Eagar <joeedh@gmail.com>2010-09-04 09:31:25 +0400
commitbb7339a7aec37bdb2ee8a21599e6c65b37ef1277 (patch)
tree6fb8da94c6e43098c606f768e722484b04b8645c /release/Makefile
parent37f2c8a64c3277f100ab084ef1bb3846bc7b2c62 (diff)
parent8a320974f1b3e6004db3b3ad64f97742f878cbee (diff)
merge with trunk at r31523
Diffstat (limited to 'release/Makefile')
-rw-r--r--release/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/release/Makefile b/release/Makefile
index 809ac548724..bef76b349b2 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -16,7 +16,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
# All rights reserved.
@@ -114,8 +114,8 @@ install: package
ifneq ($(OS), darwin)
@[ ! -d $(OCGDIR)/bin/.blender ] || \
cp -r $(OCGDIR)/bin/.blender $(DISTDIR)
- @cp $(NANBLENDERHOME)/bin/.blender/.Blanguages $(CONFDIR)
- @cp $(NANBLENDERHOME)/bin/.blender/.bfont.ttf $(CONFDIR)
+ @cp $(NANBLENDERHOME)/release/bin/.blender/.Blanguages $(CONFDIR)
+ @cp $(NANBLENDERHOME)/release/bin/.blender/.bfont.ttf $(CONFDIR)
endif
@echo "----> Copy blender$(EXT0) executable"
ifeq ($(TYPE),-static)