Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-09 08:48:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GtkMozilla shouldn't know about Mozilla's dist path as it can be changed by setting DIST.

Browse Source
This commit is contained in:
cls%seawood.org 1999-08-29 04:52:37 +00:00
parent 20364c9f5a
commit 8bdd892a17
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@ -3041,6 +3041,6 @@ MAKEFILES=
unset CONFIG_FILES
if test "$MOZ_ENABLE_GTK_MOZILLA"; then
ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist --with-mozilla=$MOZ_BUILD_ROOT"
ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist --with-mozilla=$MOZ_BUILD_ROOT/dist"
AC_OUTPUT_SUBDIRS(webshell/embed/gtk)
fi

4
webshell/embed/gtk/lib/Makefile.am
View File

@ -12,7 +12,7 @@ libgtkmozilla_la_SOURCES = \
nsNewTimer.cpp \
nsSetupRegistry.cpp
MOZILLA_INCLUDES = -I@MOZILLA_DIR@/dist/include -I@NSPR_DIR@/include
MOZILLA_INCLUDES = -I@MOZILLA_DIR@/include -I@NSPR_DIR@/include
# Mozilla libs:
NULL =
@ -38,7 +38,7 @@ ALL_MOZ_LIBS = \
$(TK_LIBS) \
$(NULL)
MOZILLA_LIBS=-L$(MOZILLA_DIR)/dist/lib \
MOZILLA_LIBS=-L$(MOZILLA_DIR)/lib \
$(ALL_MOZ_LIBS)
INCLUDES = $(MOZILLA_INCLUDES) @GTK_CFLAGS@ @DEBUG_FLAGS@

4
webshell/embed/gtk/lib/Makefile.in
View File

@ -86,7 +86,7 @@ include_HEADERS = gtkmozilla.h
libgtkmozilla_la_SOURCES = gtkmozilla.cpp gtkmozilla.h GtkMozillaContainer.h GtkMozillaContainer.cpp GtkMozillaInputStream.h GtkMozillaInputStream.cpp nsNewTimer.cpp nsSetupRegistry.cpp
MOZILLA_INCLUDES = -I@MOZILLA_DIR@/dist/include -I@NSPR_DIR@/include
MOZILLA_INCLUDES = -I@MOZILLA_DIR@/include -I@NSPR_DIR@/include
# Mozilla libs:
NULL =
@ -104,7 +104,7 @@ TK_LIBS =
ALL_MOZ_LIBS = $(GECKO_LIBS) $(BASE_LIBS) $(JSJ_LIB) $(NSPR_LIBS) $(TK_LIBS) $(NULL)
MOZILLA_LIBS = -L$(MOZILLA_DIR)/dist/lib $(ALL_MOZ_LIBS)
MOZILLA_LIBS = -L$(MOZILLA_DIR)/lib $(ALL_MOZ_LIBS)
INCLUDES = $(MOZILLA_INCLUDES) @GTK_CFLAGS@ @DEBUG_FLAGS@