1 # HG changeset patch

     2 # Parent cfb5f66680d999596106fcf9debe4bf35e4d7aac

     3 diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk

     4 --- a/toolkit/mozapps/installer/packager.mk

     5 +++ b/toolkit/mozapps/installer/packager.mk

     6 @@ -708,20 +708,22 @@ ifdef INSTALL_SDK # Here comes the hard 

     7  	$(NSINSTALL) -D $(DESTDIR)$(includedir)

     8  	(cd $(DIST)/include && tar $(TAR_CREATE_FLAGS) - .) | \

     9  	  (cd $(DESTDIR)$(includedir) && tar -xf -)

    10  	$(NSINSTALL) -D $(DESTDIR)$(idldir)

    11  	(cd $(DIST)/idl && tar $(TAR_CREATE_FLAGS) - .) | \

    12  	  (cd $(DESTDIR)$(idldir) && tar -xf -)

    13  # SDK directory is the libs + a bunch of symlinks

    14  	$(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/lib

    15 +	$(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/bin

    16  	if test -f $(DIST)/include/xpcom-config.h; then \

    17  	  $(SYSINSTALL) $(IFLAGS1) $(DIST)/include/xpcom-config.h $(DESTDIR)$(sdkdir); \

    18  	fi

    19  	(cd $(DIST)/sdk/lib && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/lib && tar -xf -)

    20 +	(cd $(DIST)/sdk/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/bin && tar -xf -)

    21  	$(RM) -f $(DESTDIR)$(sdkdir)/lib $(DESTDIR)$(sdkdir)/bin $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/sdk/idl $(DESTDIR)$(sdkdir)/idl

    22  	ln -s $(sdkdir)/sdk/lib $(DESTDIR)$(sdkdir)/lib

    23  	ln -s $(installdir) $(DESTDIR)$(sdkdir)/bin

    24  	ln -s $(includedir) $(DESTDIR)$(sdkdir)/include

    25  	ln -s $(idldir) $(DESTDIR)$(sdkdir)/idl

    26  endif # INSTALL_SDK

    27  

    28  make-sdk: