Get OBJDIR_NAME and OS_ARCH from the makefile as opposed to the arch.sh

script.  arch.sh should be cvs removed when we are sure about this change.
Checkin on behalf of Sonja Mirtitsch <sonmi@netscape.com>.
Modified file: init.sh
Added file: Makefile
This commit is contained in:
wtc%netscape.com 2000-09-13 19:19:05 +00:00
Родитель 15cbbfee09
Коммит 4c69e27bae
2 изменённых файлов: 45 добавлений и 2 удалений

Просмотреть файл

@ -0,0 +1,43 @@
#! gmake
#
# The contents of this file are subject to the Mozilla Public
# License Version 1.1 (the "License"); you may not use this file
# except in compliance with the License. You may obtain a copy of
# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
# implied. See the License for the specific language governing
# rights and limitations under the License.
#
# The Original Code is the Netscape security libraries.
#
# The Initial Developer of the Original Code is Netscape
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1994-2000 Netscape Communications Corporation. All
# Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the
# terms of the GNU General Public License Version 2 or later (the
# "GPL"), in which case the provisions of the GPL are applicable
# instead of those above. If you wish to allow use of your
# version of this file only under the terms of the GPL and not to
# allow others to use your version of this file under the MPL,
# indicate your decision by deleting the provisions above and
# replace them with the notice and other provisions required by
# the GPL. If you do not delete the provisions above, a recipient
# may use your version of this file under either the MPL or the
# GPL.
#
CORE_DEPTH = ../../..
include $(CORE_DEPTH)/coreconf/config.mk
objdir_name:
@echo $(OBJDIR_NAME)
os_arch:
@echo $(OS_ARCH)

Просмотреть файл

@ -10,8 +10,8 @@ COMMON=${TEST_COMMON-$common}
DIST=${DIST-${MOZILLA_ROOT}/dist}
SECURITY_ROOT=${SECURITY_ROOT-${MOZILLA_ROOT}/security/nss}
TESTDIR=${TESTDIR-${MOZILLA_ROOT}/tests_results/security}
. ../common/arch.sh
OBJDIR=${OBJDIR_NAME}
OBJDIR=`cd ../common; gmake objdir_name`
OS_ARCH=`cd ../common; gmake os_arch`
if [ ${OS_ARCH} = "WINNT" ]; then
PATH=${DIST}/${OBJDIR}/bin\;${DIST}/${OBJDIR}/lib\;$PATH
else