forked from bartvdbraak/blender
Makefile fix, the getversion.py was using minor release numbers,
which conflicts how paths work in BLI bundle detection.
This commit is contained in:
parent
01169dd632
commit
b195cdd14c
@ -156,7 +156,7 @@ endif
|
||||
ifeq ($(OS),darwin)
|
||||
@echo "----> Copy python modules"
|
||||
@mkdir $(CONFDIR)/python/
|
||||
@unzip -q $(LCGDIR)/release/python.zip -d $(CONFDIR)/python/
|
||||
@unzip -q $(LCGDIR)/release/python_ppc.zip -d $(CONFDIR)/python/
|
||||
endif
|
||||
|
||||
ifeq ($(OS),darwin)
|
||||
|
@ -57,10 +57,8 @@ for line in infile.readlines():
|
||||
infile.close()
|
||||
|
||||
# Major was changed to float, but minor is still a string
|
||||
if minor and major:
|
||||
if minor == "0":
|
||||
print "%.2f" % major
|
||||
else:
|
||||
print "%.2f.%s" % (major, minor)
|
||||
# Note: removed returning minor, this messes up with install path code in BLI module
|
||||
if major:
|
||||
print "%.2f" % major
|
||||
else:
|
||||
print "unknownversion"
|
||||
|
Loading…
Reference in New Issue
Block a user