1 --- xulrunner-7.0/mozilla/toolkit/mozapps/installer/packager.mk.orig 2011-09-22 22:20:42.000000000 +0200
2 +++ xulrunner-7.0/mozilla/toolkit/mozapps/installer/packager.mk 2011-09-28 11:14:05.247518747 +0200
4 @$(NSINSTALL) -D $(DIST)/xpt
5 @($(XPIDL_LINK) $(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/*.xpt && rm -f $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/*.xpt && cp $(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components && printf "interfaces $(MOZ_PKG_APPNAME).xpt\n" >$(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/interfaces.manifest) || echo No *.xpt files found in: $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/. Continuing...
7 - @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
8 + cp -rfLp $(DIST)/bin/* $(MOZ_PKG_DIR)
11 @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
13 $(error "make install" is not supported on this platform. Use "make package" instead.)
15 $(NSINSTALL) -D $(DESTDIR)$(installdir)
16 - (cd $(DIST)/$(MOZ_PKG_DIR) && tar --exclude=precomplete $(TAR_CREATE_FLAGS) - .) | \
17 - (cd $(DESTDIR)$(installdir) && tar -xf -)
18 + cp -rfLp $(DIST)/$(MOZ_PKG_DIR)/* $(DESTDIR)$(installdir)
19 $(NSINSTALL) -D $(DESTDIR)$(bindir)
20 $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
21 - ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)
22 + ln -s $(installdir)/$(MOZ_APP_NAME)-bin $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
23 ifdef INSTALL_SDK # Here comes the hard part
24 $(NSINSTALL) -D $(DESTDIR)$(includedir)
25 - (cd $(DIST)/include && tar $(TAR_CREATE_FLAGS) - .) | \
26 - (cd $(DESTDIR)$(includedir) && tar -xf -)
27 + cp -rfLp $(DIST)/include/* $(DESTDIR)$(includedir)
28 $(NSINSTALL) -D $(DESTDIR)$(idldir)
29 - (cd $(DIST)/idl && tar $(TAR_CREATE_FLAGS) - .) | \
30 - (cd $(DESTDIR)$(idldir) && tar -xf -)
31 + cp -rfLp $(DIST)/idl/* $(DESTDIR)$(idldir)
32 # SDK directory is the libs + a bunch of symlinks
33 $(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/lib
34 $(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/bin
35 if test -f $(DIST)/include/xpcom-config.h; then \
36 $(SYSINSTALL) $(IFLAGS1) $(DIST)/include/xpcom-config.h $(DESTDIR)$(sdkdir); \
38 find $(DIST)/sdk -name "*.pyc" | xargs rm -f
39 - (cd $(DIST)/sdk/lib && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/lib && tar -xf -)
40 - (cd $(DIST)/sdk/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/bin && tar -xf -)
41 + cp -rfLp $(DIST)/sdk/lib/* $(DESTDIR)$(sdkdir)/sdk/lib
42 + cp -rfLp $(DIST)/sdk/bin/* $(DESTDIR)$(sdkdir)/sdk/bin
43 + # replace copies with symlinks
44 + ln -sf $(installdir)/libmozjs.so $(DESTDIR)$(sdkdir)/sdk/lib/libmozjs.so
45 + ln -sf $(installdir)/libxpcom.so $(DESTDIR)$(sdkdir)/sdk/lib/libxpcom.so
46 + ln -sf $(installdir)/libxul.so $(DESTDIR)$(sdkdir)/sdk/lib/libxul.so
47 + ln -sf $(installdir)/libmozalloc.so $(DESTDIR)$(sdkdir)/sdk/lib/libmozalloc.so
48 + chmod a+rx $(DESTDIR)$(sdkdir)/sdk/bin/xpt.py # temp fix for https://bugzilla.mozilla.org/show_bug.cgi?id=63955
49 $(RM) -f $(DESTDIR)$(sdkdir)/lib $(DESTDIR)$(sdkdir)/bin $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/sdk/idl $(DESTDIR)$(sdkdir)/idl
50 ln -s $(sdkdir)/sdk/lib $(DESTDIR)$(sdkdir)/lib
51 ln -s $(installdir) $(DESTDIR)$(sdkdir)/bin