moz/patches/no_core_abspath_in_nss.patch

   1 --- mozilla.pure/security/nss/cmd/shlibsign/Makefile    2007-02-16 03:16:24.000000000 +0100
   2 +++ mozilla/security/nss/cmd/shlibsign/Makefile 2008-11-05 14:04:54.798875000 +0100
   3 @@ -86,18 +86,47 @@
   4
   5  include ../platrules.mk
   6
   7 -SRCDIR = $(call core_abspath,.)
   8 -
   9 +ifeq ($(OS_TARGET), Darwin)
  10 +       SRCDIR = .
  11 +else
  12 +ifeq ($(OS_TARGET), Linux)
  13 +       SRCDIR = .
  14 +else
  15 +ifeq ($(OS_TARGET), WIN95)
  16 +       SRCDIR = $(shell cygpath -d $(SRCDIR))
  17 +else
  18 +       SRCDIR = $(call core_abspath,.)
  19 +endif
  20 +endif
  21 +endif
  22  %.chk: %.$(DLL_SUFFIX)
  23  ifeq ($(OS_TARGET), OS2)
  24         cd $(OBJDIR) ; cmd.exe /c $(SRCDIR)/sign.cmd $(DIST) \
  25         $(call core_abspath,$(OBJDIR)) $(OS_TARGET) \
  26         $(call core_abspath,$(NSPR_LIB_DIR)) $(call core_abspath,$<)
  27  else
  28 +ifeq ($(OS_TARGET), WIN95)
  29 +       sh $(CYGWIN_WRAPPER) ./sign.sh $(shell cygpath -d -a $(DIST)) \
  30 +       $(shell cygpath -d -a $(OBJDIR)) $(OS_TARGET) \
  31 +       $(shell cygpath -d -a $(NSPR_LIB_DIR)) $(shell cygpath -d -a $<)
  32 +else
  33 +ifeq ($(OS_TARGET), Darwin)
  34 +       cd $(SRCDIR) ; sh ./sign.sh $(DIST) \
  35 +       $(OBJDIR) $(OS_TARGET) \
  36 +       $(NSPR_LIB_DIR) $<
  37 +else
  38 +ifeq ($(OS_TARGET), Linux)
  39 +       cd $(SRCDIR) ; sh ./sign.sh $(DIST) \
  40 +       $(OBJDIR) $(OS_TARGET) \
  41 +       $(NSPR_LIB_DIR) $<
  42 +else
  43         cd $(OBJDIR) ; sh $(SRCDIR)/sign.sh $(call core_abspath,$(DIST)) \
  44         $(call core_abspath,$(OBJDIR)) $(OS_TARGET) \
  45         $(call core_abspath,$(NSPR_LIB_DIR)) $(call core_abspath,$<)
  46  endif
  47 +endif
  48 +endif
  49 +endif
  50
  51  libs install :: $(CHECKLOC)
  52