зеркало из https://github.com/mozilla/gecko-dev.git
Part of fix for Linux installer.
b = 20637 r = ssu
This commit is contained in:
Родитель
59a392eb14
Коммит
da01f7b9aa
|
@ -0,0 +1,47 @@
|
|||
#
|
||||
# The contents of this file are subject to the Netscape 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/NPL/
|
||||
#
|
||||
# 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 Mozilla Communicator client code,
|
||||
# released March 31, 1998.
|
||||
#
|
||||
# The Initial Developer of the Original Code is Netscape Communications
|
||||
# Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All
|
||||
# Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Samir Gehani <sgehani@netscape.com>
|
||||
#
|
||||
|
||||
DEPTH = ../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = xpistub
|
||||
LIBRARY_NAME = xpistub
|
||||
|
||||
CPPSRCS = \
|
||||
nsStubNotifier.cpp \
|
||||
xpistub.cpp \
|
||||
$(NULL)
|
||||
|
||||
# LOCAL_INCLUDES = -I$(srcdir)/../public
|
||||
|
||||
LIBS = \
|
||||
$(NSPR_LIBS) \
|
||||
-lxpcom \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
@ -51,6 +51,9 @@
|
|||
#include "MoreFilesExtras.h"
|
||||
#endif
|
||||
|
||||
#ifdef XP_UNIX
|
||||
#define COMPONENT_REG "component.reg"
|
||||
#endif
|
||||
|
||||
//------------------------------------------------------------------------
|
||||
// globals
|
||||
|
@ -111,7 +114,13 @@ PR_PUBLIC_API(nsresult) XPI_Init(
|
|||
nsfsRegFile += COMPONENT_REG;
|
||||
|
||||
rv = NS_InitXPCOM(&gServiceMgr, &nsfsRegFile, &nsfsDirectory);
|
||||
|
||||
#elif defined(XP_UNIX)
|
||||
nsfsDirectory = aProgramDir;
|
||||
nsfsRegFile = aProgramDir;
|
||||
nsfsRegFile += "/";
|
||||
nsfsRegFile += COMPONENT_REG;
|
||||
|
||||
rv = NS_InitXPCOM(&gServiceMgr, &nsfsRegFile, &nsfsDirectory);
|
||||
#else
|
||||
rv = NS_InitXPCOM(&gServiceMgr, NULL, NULL);
|
||||
#endif
|
||||
|
|
Загрузка…
Ссылка в новой задаче