- BR: python-modules

[packages/firefox.git] / mozilla-firefox-lib_path.patch

diff --git a/mozilla-firefox-lib_path.patch b/mozilla-firefox-lib_path.patch
index a1aae102957951808a94a289408fd1fc8e00cffa..fe55ee44bb1f4913584725bfa9a718bd1ef4966e 100644 (file)
--- a/mozilla-firefox-lib_path.patch
+++ b/mozilla-firefox-lib_path.patch
@@ -3,24 +3,10 @@ diff -ur firefox.orig/config/autoconf.mk.in firefox/config/autoconf.mk.in
 +++ firefox/config/autoconf.mk.in      2004-06-17 09:50:30.000000000 +0200
 @@ -37,7 +37,7 @@
  mandir                = @mandir@
- idldir                = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+ idldir                = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
  
--installdir    = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+installdir    = $(libdir)/mozilla-$(MOZ_APP_NAME)
- sdkdir                = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
+-mozappdir     = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++mozappdir     = $(libdir)/mozilla-$(MOZ_APP_NAME)
+ mredir                = $(libdir)/mre/mre-$(MOZ_APP_VERSION)
+ mrelibdir     = $(mredir)/lib
  
- DIST          = $(DEPTH)/dist
---- mozilla/toolkit/mozapps/installer/packager.mk      2008-06-17 18:49:11.000000000 +0200
-+++ mozilla/toolkit/mozapps/installer/packager.mk      2008-06-17 18:49:11.000000000 +0200
-@@ -343,9 +343,9 @@
- ifdef MOZ_PKG_MANIFEST
-       $(RM) -rf $(DIST)/xpt
-       $(call PACKAGER_COPY, "$(DIST)",\
--               "$(DIST)/$(MOZ_PKG_APPNAME)", \
-+               "$(DESTDIR)/$(MOZ_PKG_APPDIR)", \
-               "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1)
--      $(PERL) $(topsrcdir)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_APPNAME)/components -v -x "$(XPIDL_LINK)"
-+      $(PERL) $(topsrcdir)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DESTDIR)/$(MOZ_PKG_APPDIR)/components -v -x "$(XPIDL_LINK)"
- else # !MOZ_PKG_MANIFEST
- ifeq ($(MOZ_PKG_FORMAT),DMG)
- # If UNIVERSAL_BINARY, the package will be made from an already-prepared