wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 870306 - Put includes under /usr/include/mozjs-x.y instead of /usr/include/js-x.y on make install. r=sstangl,r=Waldo

Browse Source
This commit is contained in:
Mike Hommey 2013-05-21 08:28:13 +02:00
parent 76e47f2072
commit a594cbc7eb
4 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/src/Makefile.in
View File

@ -776,7 +776,6 @@ JS_CONFIG_SUBSTITUTIONS=\
-Dexec_prefix="$(exec_prefix)" \
-Dincludedir="$(includedir)" \
-Dlibdir="$(libdir)" \
-DMODULE="$(MODULE)" \
-DMOZILLA_VERSION="$(MOZILLA_VERSION)" \
-DLIBRARY_NAME="$(LIBRARY_NAME)" \
-DJS_CONFIG_LIBS="$(JS_CONFIG_LIBS)" \
@ -814,7 +813,7 @@ install:: $(LIBRARY_NAME).pc
# The overall directory structure of the installed headers looks like so:
#
# $(includedir)/
# $(MODULE)/
# $(LIBRARY_NAME)/
# jsapi.h, jspubtd.h, etc. (all of EXPORTS)
# js/
# js/public/* headers (all are public)
@ -827,13 +826,13 @@ install:: $(LIBRARY_NAME).pc
#
install:: $(EXPORTS)
$(SYSINSTALL) $^ $(DESTDIR)$(includedir)/$(MODULE)
$(SYSINSTALL) $^ $(DESTDIR)$(includedir)/$(LIBRARY_NAME)
install:: $(EXPORTS_js)
$(SYSINSTALL) $^ $(DESTDIR)$(includedir)/$(MODULE)/js
$(SYSINSTALL) $^ $(DESTDIR)$(includedir)/$(LIBRARY_NAME)/js
install:: $(EXPORTS_mozilla)
$(SYSINSTALL) $^ $(DESTDIR)$(includedir)/$(MODULE)/mozilla
$(SYSINSTALL) $^ $(DESTDIR)$(includedir)/$(LIBRARY_NAME)/mozilla
#
# END SpiderMonkey header installation

3
js/src/js-config.in
View File

@ -6,7 +6,6 @@
prefix='@prefix@'
mozilla_version='@MOZILLA_VERSION@'
MODULE='@MODULE@'
LIBRARY_NAME='@LIBRARY_NAME@'
NSPR_CFLAGS='@NSPR_CFLAGS@'
JS_CONFIG_LIBS='@JS_CONFIG_LIBS@'
@ -110,7 +109,7 @@ if test "$echo_libdir" = "yes"; then
fi
if test "$echo_cflags" = "yes"; then
echo "-include $includedir/$MODULE/js/RequiredDefines.h -I$includedir/$MODULE $NSPR_CFLAGS"
echo "-include $includedir/$LIBRARY_NAME/js/RequiredDefines.h -I$includedir/$LIBRARY_NAME $NSPR_CFLAGS"
fi
if test "$echo_libs" = "yes"; then

2
js/src/js.pc.in
View File

@ -8,4 +8,4 @@ Description: The Mozilla library for JavaScript
Version: @MOZILLA_VERSION@
Requires.private: @NSPR_PKGCONF_CHECK@
Libs: -L${libdir} -l@LIBRARY_NAME@
Cflags: -include ${includedir}/@MODULE@/js/RequiredDefines.h -I${includedir}/@MODULE@
Cflags: -include ${includedir}/@LIBRARY_NAME@/js/RequiredDefines.h -I${includedir}/@LIBRARY_NAME@

3
js/src/moz.build
View File

@ -23,9 +23,6 @@ if CONFIG['OS_ARCH'] != 'ANDROID':
TEST_DIRS += ['tests', 'gdb']
MODULE = 'js'
if CONFIG['JS_STANDALONE']:
MODULE = 'js-%s.%s%s' % (CONFIG['MOZJS_MAJOR_VERSION'], CONFIG['MOZJS_MINOR_VERSION'],
CONFIG['MOZJS_ALPHA'])
CONFIGURE_SUBST_FILES += ['devtools/rootAnalysis/Makefile']