Mercurial Mercurial > hg > mozilla / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mozilla-639554.patch
author Wolfgang Rosenauer <wr@rosenauer.org>
Fri, 23 Sep 2011 13:16:54 +0200
branchfirefox6
changeset 332 15b1945a3bc1
permissions -rw-r--r--
install xpt.py correctly
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
332
15b1945a3bc1 install xpt.py correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     1
 
# HG changeset patch
15b1945a3bc1 install xpt.py correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     2
 
# Parent cfb5f66680d999596106fcf9debe4bf35e4d7aac
15b1945a3bc1 install xpt.py correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     3
 
diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
15b1945a3bc1 install xpt.py correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     4
 
--- a/toolkit/mozapps/installer/packager.mk
15b1945a3bc1 install xpt.py correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     5
 
+++ b/toolkit/mozapps/installer/packager.mk
15b1945a3bc1 install xpt.py correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     6
 
@@ -708,20 +708,22 @@ ifdef INSTALL_SDK # Here comes the hard
15b1945a3bc1 install xpt.py correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     7
 
 	$(NSINSTALL) -D $(DESTDIR)$(includedir)
15b1945a3bc1 install xpt.py correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     8
 
 	(cd $(DIST)/include && tar $(TAR_CREATE_FLAGS) - .) | \
15b1945a3bc1 install xpt.py correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     9
 
 	  (cd $(DESTDIR)$(includedir) && tar -xf -)
15b1945a3bc1 install xpt.py correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    10
 
 	$(NSINSTALL) -D $(DESTDIR)$(idldir)
15b1945a3bc1 install xpt.py correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    11
 
 	(cd $(DIST)/idl && tar $(TAR_CREATE_FLAGS) - .) | \
15b1945a3bc1 install xpt.py correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    12
 
 	  (cd $(DESTDIR)$(idldir) && tar -xf -)
15b1945a3bc1 install xpt.py correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    13
 
 # SDK directory is the libs + a bunch of symlinks
15b1945a3bc1 install xpt.py correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    14
 
 	$(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/lib
15b1945a3bc1 install xpt.py correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    15
 
+	$(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/bin
15b1945a3bc1 install xpt.py correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    16
 
 	if test -f $(DIST)/include/xpcom-config.h; then \
15b1945a3bc1 install xpt.py correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    17
 
 	  $(SYSINSTALL) $(IFLAGS1) $(DIST)/include/xpcom-config.h $(DESTDIR)$(sdkdir); \
15b1945a3bc1 install xpt.py correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    18
 
 	fi
15b1945a3bc1 install xpt.py correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    19
 
 	(cd $(DIST)/sdk/lib && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/lib && tar -xf -)
15b1945a3bc1 install xpt.py correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    20
 
+	(cd $(DIST)/sdk/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/bin && tar -xf -)
15b1945a3bc1 install xpt.py correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    21
 
 	$(RM) -f $(DESTDIR)$(sdkdir)/lib $(DESTDIR)$(sdkdir)/bin $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/sdk/idl $(DESTDIR)$(sdkdir)/idl
15b1945a3bc1 install xpt.py correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    22
 
 	ln -s $(sdkdir)/sdk/lib $(DESTDIR)$(sdkdir)/lib
15b1945a3bc1 install xpt.py correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    23
 
 	ln -s $(installdir) $(DESTDIR)$(sdkdir)/bin
15b1945a3bc1 install xpt.py correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    24
 
 	ln -s $(includedir) $(DESTDIR)$(sdkdir)/include
15b1945a3bc1 install xpt.py correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    25
 
 	ln -s $(idldir) $(DESTDIR)$(sdkdir)/idl
15b1945a3bc1 install xpt.py correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    26
 
 endif # INSTALL_SDK
15b1945a3bc1 install xpt.py correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    27
15b1945a3bc1 install xpt.py correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    28
 
 make-sdk:
mozilla