76 lines
3.4 KiB
Diff
76 lines
3.4 KiB
Diff
diff -up mozilla/config/autoconf.mk.in.pk mozilla/config/autoconf.mk.in
|
|
--- mozilla/config/autoconf.mk.in.pk 2007-10-11 20:50:54.000000000 +0200
|
|
+++ mozilla/config/autoconf.mk.in 2008-01-16 16:29:22.000000000 +0100
|
|
@@ -58,14 +58,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
|
|
prefix = @prefix@
|
|
exec_prefix = @exec_prefix@
|
|
bindir = @bindir@
|
|
-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
|
+includedir = @includedir@/$(MOZ_APP_NAME)-sdk-$(MOZ_APP_VERSION)
|
|
libdir = @libdir@
|
|
datadir = @datadir@
|
|
mandir = @mandir@
|
|
-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
|
+idldir = $(datadir)/idl/$(MOZ_APP_NAME)-sdk-$(MOZ_APP_VERSION)
|
|
|
|
installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
|
-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
|
|
+sdkdir = $(libdir)/$(MOZ_APP_NAME)-sdk-$(MOZ_APP_VERSION)
|
|
|
|
DIST = $(DEPTH)/dist
|
|
LIBXUL_SDK = @LIBXUL_SDK@
|
|
diff -up mozilla/xulrunner/installer/libxul.pc.in.pk mozilla/xulrunner/installer/libxul.pc.in
|
|
--- mozilla/xulrunner/installer/libxul.pc.in.pk 2007-08-03 16:46:28.000000000 +0200
|
|
+++ mozilla/xulrunner/installer/libxul.pc.in 2008-01-16 16:40:56.000000000 +0100
|
|
@@ -1,7 +1,8 @@
|
|
prefix=%prefix%
|
|
sdkdir=%sdkdir%
|
|
+libdir=%libdir%
|
|
includedir=%includedir%
|
|
-idldir=%idldir%
|
|
+idldir=%idldir%/stable
|
|
includetype=stable
|
|
|
|
# Note: the default pkg-config includes will only list include directories
|
|
diff -up mozilla/xulrunner/installer/Makefile.in.pk mozilla/xulrunner/installer/Makefile.in
|
|
--- mozilla/xulrunner/installer/Makefile.in.pk 2008-01-16 16:29:22.000000000 +0100
|
|
+++ mozilla/xulrunner/installer/Makefile.in 2008-01-16 16:42:57.000000000 +0100
|
|
@@ -117,6 +117,7 @@ endif
|
|
-e "s|%includedir%|$(includedir)|" \
|
|
-e "s|%idldir%|$(idldir)|" \
|
|
-e "s|%sdkdir%|$(sdkdir)|" \
|
|
+ -e "s|%libdir%|$(installdir)|" \
|
|
-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
|
|
-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
|
|
-e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \
|
|
diff -up mozilla/xulrunner/installer/libxul-unstable.pc.in.pk mozilla/xulrunner/installer/libxul-unstable.pc.in
|
|
--- mozilla/xulrunner/installer/libxul-unstable.pc.in.pk 2008-01-05 07:50:34.000000000 +0100
|
|
+++ mozilla/xulrunner/installer/libxul-unstable.pc.in 2008-01-16 16:41:23.000000000 +0100
|
|
@@ -1,7 +1,8 @@
|
|
prefix=%prefix%
|
|
sdkdir=%sdkdir%
|
|
+libdir=%libdir%
|
|
includedir=%includedir%
|
|
-idldir=%idldir%
|
|
+idldir=%idldir%/unstable
|
|
includetype=unstable
|
|
|
|
Name: libxul
|
|
diff -up mozilla/xulrunner/installer/mozilla-js.pc.in.pk mozilla/xulrunner/installer/mozilla-js.pc.in
|
|
--- mozilla/xulrunner/installer/mozilla-js.pc.in.pk 2007-08-03 16:46:28.000000000 +0200
|
|
+++ mozilla/xulrunner/installer/mozilla-js.pc.in 2008-01-16 16:29:22.000000000 +0100
|
|
@@ -7,4 +7,4 @@ Description: The Mozilla JavaScript Libr
|
|
Version: %MOZILLA_VERSION%
|
|
Requires: %NSPR_NAME% >= %NSPR_VERSION%
|
|
Libs: -L${sdkdir}/lib -lmozjs
|
|
-Cflags: -I${includedir}/stable -DXP_UNIX -DJS_THREADSAFE
|
|
+Cflags: -I${includedir}/stable -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE
|
|
diff -up mozilla/xulrunner/installer/mozilla-plugin.pc.in.pk mozilla/xulrunner/installer/mozilla-plugin.pc.in
|
|
--- mozilla/xulrunner/installer/mozilla-plugin.pc.in.pk 2007-08-03 16:46:28.000000000 +0200
|
|
+++ mozilla/xulrunner/installer/mozilla-plugin.pc.in 2008-01-16 16:29:22.000000000 +0100
|
|
@@ -6,4 +6,4 @@ Name: Mozilla Plug-In API
|
|
Description: Mozilla Plug-In API
|
|
Version: %MOZILLA_VERSION%
|
|
Requires: %NSPR_NAME% >= %NSPR_VERSION%
|
|
-Cflags: -I${includedir}/stable
|
|
+Cflags: -I${includedir}/stable -I${includedir}/java -I${includedir}/plugin
|