Commit 3f70ddf1 authored by Casey Strouse's avatar Casey Strouse Committed by GitHub

Merge pull request #4057 from uberhacker/add-CREW_MAN_PREFIX-constant

Add CREW_MAN_PREFIX and CREW_DEST_MAN_PREFIX constants
parents 82785f70 a06aecf0
...@@ -262,9 +262,11 @@ def const (var) ...@@ -262,9 +262,11 @@ def const (var)
'CREW_DEST_DIR', 'CREW_DEST_DIR',
'CREW_DEST_HOME', 'CREW_DEST_HOME',
'CREW_DEST_LIB_PREFIX', 'CREW_DEST_LIB_PREFIX',
'CREW_DEST_MAN_PREFIX',
'CREW_DEST_PREFIX', 'CREW_DEST_PREFIX',
'CREW_LIB_PATH', 'CREW_LIB_PATH',
'CREW_LIB_PREFIX', 'CREW_LIB_PREFIX',
'CREW_MAN_PREFIX',
'CREW_NOT_COMPRESS', 'CREW_NOT_COMPRESS',
'CREW_NOT_STRIP', 'CREW_NOT_STRIP',
'CREW_NPROC', 'CREW_NPROC',
......
# Defines common constants used in different parts of crew # Defines common constants used in different parts of crew
CREW_VERSION = '1.3.6' CREW_VERSION = '1.3.7'
ARCH = `uname -m`.strip ARCH = `uname -m`.strip
ARCH_LIB = if ARCH == 'x86_64' then 'lib64' else 'lib' end ARCH_LIB = if ARCH == 'x86_64' then 'lib64' else 'lib' end
...@@ -13,6 +13,7 @@ else ...@@ -13,6 +13,7 @@ else
@pkg.build_from_source = true @pkg.build_from_source = true
end end
CREW_LIB_PREFIX = CREW_PREFIX + '/' + ARCH_LIB CREW_LIB_PREFIX = CREW_PREFIX + '/' + ARCH_LIB
CREW_MAN_PREFIX = CREW_PREFIX + '/share/man'
CREW_LIB_PATH = CREW_PREFIX + '/lib/crew/' CREW_LIB_PATH = CREW_PREFIX + '/lib/crew/'
CREW_CONFIG_PATH = CREW_PREFIX + '/etc/crew/' CREW_CONFIG_PATH = CREW_PREFIX + '/etc/crew/'
...@@ -20,6 +21,7 @@ CREW_BREW_DIR = CREW_PREFIX + '/tmp/crew/' ...@@ -20,6 +21,7 @@ CREW_BREW_DIR = CREW_PREFIX + '/tmp/crew/'
CREW_DEST_DIR = CREW_BREW_DIR + 'dest' CREW_DEST_DIR = CREW_BREW_DIR + 'dest'
CREW_DEST_PREFIX = CREW_DEST_DIR + CREW_PREFIX CREW_DEST_PREFIX = CREW_DEST_DIR + CREW_PREFIX
CREW_DEST_LIB_PREFIX = CREW_DEST_DIR + CREW_LIB_PREFIX CREW_DEST_LIB_PREFIX = CREW_DEST_DIR + CREW_LIB_PREFIX
CREW_DEST_MAN_PREFIX = CREW_DEST_DIR + CREW_MAN_PREFIX
if ENV['CREW_PREFIX'].to_s == '' if ENV['CREW_PREFIX'].to_s == ''
HOME = ENV['HOME'] HOME = ENV['HOME']
...@@ -54,4 +56,4 @@ when 'i686' ...@@ -54,4 +56,4 @@ when 'i686'
when 'x86_64' when 'x86_64'
CREW_BUILD = 'x86_64-cros-linux-gnu' CREW_BUILD = 'x86_64-cros-linux-gnu'
end end
CREW_OPTIONS = "--prefix=#{CREW_PREFIX} --libdir=#{CREW_LIB_PREFIX} --mandir=#{CREW_PREFIX}/share/man --build=#{CREW_BUILD} --host=#{CREW_BUILD} --target=#{CREW_BUILD}" CREW_OPTIONS = "--prefix=#{CREW_PREFIX} --libdir=#{CREW_LIB_PREFIX} --mandir=#{CREW_MAN_PREFIX} --build=#{CREW_BUILD} --host=#{CREW_BUILD} --target=#{CREW_BUILD}"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment