pkgs/slang/patches/slang-2.1.4-makefile.patch

   1 diff -up slang-2.1.4/autoconf/Makefile.in.makefile slang-2.1.4/autoconf/Makefile.in
   2 --- slang-2.1.4/autoconf/Makefile.in.makefile   2008-09-06 06:29:27.000000000 +0200
   3 +++ slang-2.1.4/autoconf/Makefile.in    2008-09-08 13:18:42.000000000 +0200
   4 @@ -32,8 +32,7 @@ help:
   5         @echo "make check : Build the library and run the regression tests"
   6  static: makefiles
   7         cd src; $(MAKE) static
   8 -       cd slsh; $(MAKE) all
   9 -elf: makefiles
  10 +elf: makefiles static
  11         cd src; $(MAKE) elf
  12         cd slsh; $(MAKE) all
  13         cd modules; $(MAKE) all
  14 diff -up slang-2.1.4/modules/Makefile.in.makefile slang-2.1.4/modules/Makefile.in
  15 --- slang-2.1.4/modules/Makefile.in.makefile    2008-08-25 01:57:48.000000000 +0200
  16 +++ slang-2.1.4/modules/Makefile.in     2008-09-08 13:18:42.000000000 +0200
  17 @@ -53,7 +53,7 @@ SOCKET_LIBS = @X_EXTRA_LIBS@
  18  MODULE_INSTALL_DIR = @libdir@/slang/v@slang_major_version@/modules
  19  INSTALL                = @INSTALL@
  20  INSTALL_DATA   = @INSTALL_DATA@
  21 -INSTALL_MODULE = @INSTALL_MODULE@
  22 +INSTALL_MODULE = @INSTALL@
  23  MKINSDIR       = ../autoconf/mkinsdir.sh
  24  SLSH_DIR       = $(prefix)/share/slsh
  25  CMAPS_DIR      = $(SLSH_DIR)/cmaps
  26 @@ -67,7 +67,7 @@ DEST_SLSH_DIR = $(DESTDIR)$(SLSH_DIR)
  27  DEST_CMAPSDIR  = $(DESTDIR)$(CMAPS_DIR)
  28  DEST_HELPDIR   = $(DESTDIR)$(HELP_DIR)
  29  #---------------------------------------------------------------------------
  30 -RPATH = @RPATH@
  31 +RPATH =
  32
  33  LIBS = $(LDFLAGS) $(RPATH) $(SLANG_LIB) $(DL_LIB) @M_LIB@
  34  #LIBS = $(RPATH) $(DL_LIB) @M_LIB@
  35 diff -up slang-2.1.4/slsh/Makefile.in.makefile slang-2.1.4/slsh/Makefile.in
  36 --- slang-2.1.4/slsh/Makefile.in.makefile       2008-08-25 01:57:48.000000000 +0200
  37 +++ slang-2.1.4/slsh/Makefile.in        2008-09-08 13:21:35.000000000 +0200
  38 @@ -15,7 +15,7 @@ SLANG_SRCINC  = -I@SRCDIR@
  39  SLANG_SRCLIB   = -L@ELFDIR@
  40  #---------------------------------------------------------------------------
  41  OTHER_LIBS     = @TERMCAP@ @DYNAMIC_LINK_LIB@ @LIBS@ @M_LIB@
  42 -RPATH          = @RPATH@
  43 +RPATH          =
  44  #----------------------------------------------------------------------------
  45  INSTALL                = @INSTALL@
  46  INSTALL_DATA   = @INSTALL_DATA@
  47 @@ -64,7 +64,7 @@ DEST_SLSH_DOC_DIR= $(DESTDIR)$(SLSH_DOC_
  48  #----------------------------------------------------------------------------
  49  @SET_MAKE@
  50  SHELL = /bin/sh
  51 -INST_LIBS = $(RPATH) $(SLANG_INST_LIB) $(DEST_LIB_DIR) -lslang $(READLINE_LIB) $(OTHER_LIBS)
  52 +INST_LIBS = $(RPATH) $(DEST_LIB_DIR) $(SLANG_INST_LIB) -lslang $(READLINE_LIB) $(OTHER_LIBS)
  53  DEFS = -DSLSH_CONF_DIR='"$(SLSH_CONF_DIR)"' -DSLSH_PATH='"$(SLSH_LIB_DIR)"' \
  54   -DSLSH_CONF_DIR_ENV='$(SLSH_CONF_DIR_ENV)' -DSLSH_LIB_DIR_ENV='$(SLSH_LIB_DIR_ENV)' \
  55   -DSLSH_PATH_ENV='$(SLSH_PATH_ENV)'
  56 diff -up slang-2.1.4/src/Makefile.in.makefile slang-2.1.4/src/Makefile.in
  57 --- slang-2.1.4/src/Makefile.in.makefile        2008-09-06 06:16:22.000000000 +0200
  58 +++ slang-2.1.4/src/Makefile.in 2008-09-08 13:18:42.000000000 +0200
  59 @@ -139,17 +139,21 @@ UPDATE_VERSION_SCRIPT = $(HOME)/bin/upda
  60  # Rules
  61  #---------------------------------------------------------------------------
  62  all: static elf
  63 -static: $(OBJDIR) $(CONFIG_H) $(OBJDIR_NORMAL_LIB) $(OTHERSTUFF)
  64 -elf: $(ELFDIR) $(CONFIG_H) $(ELFDIR_ELF_LIB)
  65 +static: $(OBJDIR)/stamp $(CONFIG_H) $(OBJDIR_NORMAL_LIB) $(OTHERSTUFF)
  66 +elf: $(ELFDIR)/stamp $(CONFIG_H) $(ELFDIR_ELF_LIB)
  67
  68 -$(OBJDIR_NORMAL_LIB): $(OBJDIR) $(CONFIG_H) $(OBJS)
  69 +$(OBJS): $(OBJDIR)/stamp
  70 +
  71 +$(ELFOBJS): $(ELFDIR)/stamp
  72 +
  73 +$(OBJDIR_NORMAL_LIB): $(CONFIG_H) $(OBJS)
  74         -$(RM) $(OBJDIR_NORMAL_LIB)
  75         cd $(OBJDIR); $(AR_CR) $(NORMAL_LIB) $(OFILES)
  76         $(RANLIB) $(OBJDIR_NORMAL_LIB)
  77         @echo ""
  78         @echo $(NORMAL_LIB) created in $(OBJDIR)
  79
  80 -$(ELFDIR_ELF_LIB): $(ELFDIR) $(CONFIG_H) $(ELFOBJS) $(VERSION_SCRIPT)
  81 +$(ELFDIR_ELF_LIB): $(CONFIG_H) $(ELFOBJS) $(VERSION_SCRIPT)
  82         -$(RM) $(ELFDIR_ELF_LIB)
  83         cd $(ELFDIR); $(ELF_LINK_CMD) -o $(ELFLIB_BUILD_NAME) $(OFILES) $(LDFLAGS) $(ELF_DEP_LIBS)
  84         if [ $(ELFLIB_MAJOR) != $(ELFLIB_BUILD_NAME) ]; then \
  85 @@ -160,10 +164,12 @@ $(ELFDIR_ELF_LIB): $(ELFDIR) $(CONFIG_H)
  86         @echo $(ELFLIB_BUILD_NAME) created in $(ELFDIR).
  87         @echo The link $(ELFLIB) to $(ELFLIB_BUILD_NAME) was also created.
  88         @echo ""
  89 -$(OBJDIR) :
  90 +$(OBJDIR)/stamp :
  91         -$(MKDIR) $(OBJDIR)
  92 -$(ELFDIR) :
  93 +       touch $(OBJDIR)/stamp
  94 +$(ELFDIR)/stamp :
  95         -$(MKDIR) $(ELFDIR)
  96 +       touch $(ELFDIR)/stamp
  97  $(CONFIG_H) : sysconf.h
  98         -$(CP) sysconf.h $(CONFIG_H)
  99
 100 @@ -194,9 +200,9 @@ install-elf-and-links:
 101         -$(RM) $(DEST_LIBDIR)/$(ELFLIB)
 102         -$(RM) $(DEST_LIBDIR)/$(ELFLIB_MAJOR)
 103         @echo installing $(ELFLIB_BUILD_NAME) in $(DEST_LIBDIR)
 104 -       $(INSTALL_DATA) $(ELFDIR_ELF_LIB) $(DEST_LIBDIR)/
 105 +       $(INSTALL) $(ELFDIR_ELF_LIB) $(DEST_LIBDIR)/
 106         -cd $(DEST_LIBDIR); $(LN) $(ELFLIB_BUILD_NAME) $(ELFLIB_MAJOR)
 107 -       -cd $(DEST_LIBDIR); $(LN) $(ELFLIB_BUILD_NAME) $(ELFLIB)
 108 +       -cd $(DEST_LIBDIR); $(LN) $(ELFLIB_MAJOR) $(ELFLIB)
 109         @echo ""
 110         @echo $(ELFLIB_BUILD_NAME) created in $(DEST_LIBDIR).
 111         @echo The links $(ELFLIB) and $(ELFLIB_MAJOR) to $(ELFLIB_BUILD_NAME) were also created.