36 lines
1.6 KiB
Diff
36 lines
1.6 KiB
Diff
|
|
||
|
|
# HG changeset patch
|
||
|
|
# User Chris Coulson <chrisccoulson@ubuntu.com>
|
||
|
|
# Date 1306390403 -7200
|
||
|
|
# Node ID 99672871e93003520189cfe3a684ebbea151cb4b
|
||
|
|
# Parent 831f8e040f381ed58441d8bf413f9845f26ce08e
|
||
|
|
Bug 639554 - Install sdk/bin with make install. r=bsmedberg
|
||
|
|
|
||
|
|
diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
|
||
|
|
--- a/toolkit/mozapps/installer/packager.mk
|
||
|
|
+++ b/toolkit/mozapps/installer/packager.mk
|
||
|
|
@@ -704,20 +704,22 @@ ifdef INSTALL_SDK # Here comes the hard
|
||
|
|
$(NSINSTALL) -D $(DESTDIR)$(includedir)
|
||
|
|
(cd $(DIST)/include && tar $(TAR_CREATE_FLAGS) - .) | \
|
||
|
|
(cd $(DESTDIR)$(includedir) && tar -xf -)
|
||
|
|
$(NSINSTALL) -D $(DESTDIR)$(idldir)
|
||
|
|
(cd $(DIST)/idl && tar $(TAR_CREATE_FLAGS) - .) | \
|
||
|
|
(cd $(DESTDIR)$(idldir) && tar -xf -)
|
||
|
|
# SDK directory is the libs + a bunch of symlinks
|
||
|
|
$(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/lib
|
||
|
|
+ $(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/bin
|
||
|
|
if test -f $(DIST)/include/xpcom-config.h; then \
|
||
|
|
$(SYSINSTALL) $(IFLAGS1) $(DIST)/include/xpcom-config.h $(DESTDIR)$(sdkdir); \
|
||
|
|
fi
|
||
|
|
(cd $(DIST)/sdk/lib && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/lib && tar -xf -)
|
||
|
|
+ (cd $(DIST)/sdk/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/bin && tar -xf -)
|
||
|
|
$(RM) -f $(DESTDIR)$(sdkdir)/lib $(DESTDIR)$(sdkdir)/bin $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/sdk/idl $(DESTDIR)$(sdkdir)/idl
|
||
|
|
ln -s $(sdkdir)/sdk/lib $(DESTDIR)$(sdkdir)/lib
|
||
|
|
ln -s $(installdir) $(DESTDIR)$(sdkdir)/bin
|
||
|
|
ln -s $(includedir) $(DESTDIR)$(sdkdir)/include
|
||
|
|
ln -s $(idldir) $(DESTDIR)$(sdkdir)/idl
|
||
|
|
endif # INSTALL_SDK
|
||
|
|
|
||
|
|
make-sdk:
|
||
|
|
|