diff -p -up mozilla/config/autoconf.mk.in.pkgconfig mozilla/config/autoconf.mk.in --- mozilla/config/autoconf.mk.in.pkgconfig 2008-09-14 08:49:39.000000000 +0200 +++ mozilla/config/autoconf.mk.in 2008-09-14 08:49:40.000000000 +0200 @@ -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 = $(includedir) +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 -p -up mozilla/xulrunner/installer/libxul-embedding.pc.in.pkgconfig mozilla/xulrunner/installer/libxul-embedding.pc.in --- mozilla/xulrunner/installer/libxul-embedding.pc.in.pkgconfig 2007-08-03 16:46:28.000000000 +0200 +++ mozilla/xulrunner/installer/libxul-embedding.pc.in 2008-09-14 08:49:40.000000000 +0200 @@ -1,7 +1,7 @@ prefix=%prefix% sdkdir=%sdkdir% includedir=%includedir% -idldir=%idldir% +idldir=%idldir%/stable includetype=stable # Note: the default pkg-config cflags will only list include directories @@ -11,5 +11,6 @@ includetype=stable Name: libxul-embedding Description: Static library for version-independent embedding of the Mozilla runtime Version: %MOZILLA_VERSION% -Libs: -L${sdkdir}/lib -lxpcomglue +Requires: %NSPR_NAME% >= %NSPR_VERSION% +Libs: -L${sdkdir}/sdk/lib -lxpcomglue Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar diff -p -up mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in.pkgconfig mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in --- mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in.pkgconfig 2008-01-05 07:50:34.000000000 +0100 +++ mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in 2008-09-14 08:49:40.000000000 +0200 @@ -1,11 +1,12 @@ prefix=%prefix% sdkdir=%sdkdir% includedir=%includedir% -idldir=%idldir% +idldir=%idldir%/unstable includetype=unstable Name: libxul-embedding-unstable Description: Static library for version-independent embedding of the Mozilla runtime (unstable API) Version: %MOZILLA_VERSION% +Requires: %NSPR_NAME% >= %NSPR_VERSION% Libs: -L${sdkdir}/lib -lxpcomglue Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar diff -p -up mozilla/xulrunner/installer/libxul.pc.in.pkgconfig mozilla/xulrunner/installer/libxul.pc.in --- mozilla/xulrunner/installer/libxul.pc.in.pkgconfig 2007-08-03 16:46:28.000000000 +0200 +++ mozilla/xulrunner/installer/libxul.pc.in 2008-09-14 08:49:40.000000000 +0200 @@ -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 @@ -12,5 +13,5 @@ Name: libxul Description: The Mozilla Runtime and Embedding Engine Version: %MOZILLA_VERSION% Requires: %NSPR_NAME% >= %NSPR_VERSION% -Libs: -L${sdkdir}/lib -lxpcomglue_s -lxul -lxpcom +Libs: -L${sdkdir}/sdk/lib -lxpcomglue_s -lxul -lxpcom Cflags: -I${includedir}/${includetype} -fshort-wchar \ No newline at end of file diff -p -up mozilla/xulrunner/installer/libxul-unstable.pc.in.pkgconfig mozilla/xulrunner/installer/libxul-unstable.pc.in --- mozilla/xulrunner/installer/libxul-unstable.pc.in.pkgconfig 2008-01-05 07:50:34.000000000 +0100 +++ mozilla/xulrunner/installer/libxul-unstable.pc.in 2008-09-14 08:49:40.000000000 +0200 @@ -1,7 +1,8 @@ prefix=%prefix% sdkdir=%sdkdir% +libdir=%libdir% includedir=%includedir% -idldir=%idldir% +idldir=%idldir%/unstable includetype=unstable Name: libxul diff -p -up mozilla/xulrunner/installer/Makefile.in.pkgconfig mozilla/xulrunner/installer/Makefile.in --- mozilla/xulrunner/installer/Makefile.in.pkgconfig 2008-09-14 08:49:40.000000000 +0200 +++ mozilla/xulrunner/installer/Makefile.in 2008-09-14 08:49:40.000000000 +0200 @@ -118,6 +118,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 -p -up mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in.pkgconfig mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in --- mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in.pkgconfig 2008-01-10 10:17:49.000000000 +0100 +++ mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in 2008-09-14 08:49:40.000000000 +0200 @@ -1,5 +1,6 @@ prefix=%prefix% sdkdir=%sdkdir% +libdir=%libdir% includedir=%includedir% Name: mozilla-gtkembedmoz diff -p -up mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in.pkgconfig mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in --- mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in.pkgconfig 2008-01-10 10:17:49.000000000 +0100 +++ mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in 2008-09-14 08:49:40.000000000 +0200 @@ -1,5 +1,6 @@ prefix=%prefix% sdkdir=%sdkdir% +libdir=%libdir% includedir=%includedir% Name: mozilla-gtkembedmoz diff -p -up mozilla/xulrunner/installer/mozilla-js.pc.in.pkgconfig mozilla/xulrunner/installer/mozilla-js.pc.in --- mozilla/xulrunner/installer/mozilla-js.pc.in.pkgconfig 2007-08-03 16:46:28.000000000 +0200 +++ mozilla/xulrunner/installer/mozilla-js.pc.in 2008-09-14 08:50:17.000000000 +0200 @@ -1,10 +1,11 @@ prefix=%prefix% sdkdir=%sdkdir% includedir=%includedir% +libdir=%libdir% Name: JavaScript Description: The Mozilla JavaScript Library Version: %MOZILLA_VERSION% Requires: %NSPR_NAME% >= %NSPR_VERSION% -Libs: -L${sdkdir}/lib -lmozjs -Cflags: -I${includedir}/stable -DXP_UNIX -DJS_THREADSAFE +Libs: -L${sdkdir}/sdk/lib -lmozjs +Cflags: -I${includedir}/stable -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE diff -p -up mozilla/xulrunner/installer/mozilla-plugin.pc.in.pkgconfig mozilla/xulrunner/installer/mozilla-plugin.pc.in --- mozilla/xulrunner/installer/mozilla-plugin.pc.in.pkgconfig 2007-08-03 16:46:28.000000000 +0200 +++ mozilla/xulrunner/installer/mozilla-plugin.pc.in 2008-09-14 08:49:40.000000000 +0200 @@ -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