SOURCES: mozilla-firefox-lib_path.patch - reverted

[patrys]

Author: patrys                       Date: Tue Jun 17 17:40:23 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- reverted

---- Files affected:
SOURCES:
   mozilla-firefox-lib_path.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/mozilla-firefox-lib_path.patch
diff -u SOURCES/mozilla-firefox-lib_path.patch:1.2 SOURCES/mozilla-firefox-lib_path.patch:1.3
--- SOURCES/mozilla-firefox-lib_path.patch:1.2	Tue Jun 17 18:56:59 2008
+++ SOURCES/mozilla-firefox-lib_path.patch	Tue Jun 17 19:40:17 2008
@@ -3,24 +3,10 @@
 +++ 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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/mozilla-firefox-lib_path.patch?r1=1.2&r2=1.3&f=u