pkgs/by-name/tc/tcb/fix-makefiles.patch

   1 diff --git a/Make.defs b/Make.defs
   2 index a961f7d..9e8d59b 100644
   3 --- a/Make.defs
   4 +++ b/Make.defs
   5 @@ -19,7 +19,7 @@ LDFLAGS += $(DBGFLAG) -L../libs
   6
   7  PREFIX = /usr
   8  SBINDIR = /sbin
   9 -SLIBDIR = /lib
  10 +SLIBDIR = $(PREFIX)/lib
  11  INCLUDEDIR = $(PREFIX)/include
  12  LIBDIR = $(PREFIX)/lib
  13  LIBEXECDIR = $(PREFIX)/libexec
  14 diff --git a/libs/Makefile b/libs/Makefile
  15 index 0083b13..27238f6 100644
  16 --- a/libs/Makefile
  17 +++ b/libs/Makefile
  18 @@ -7,7 +7,7 @@ LIBTCB_A = libtcb.a
  19  LIB_MAP = libtcb.map
  20  NSS_MAP = libnss_tcb.map
  21
  22 -all: $(LIBTCB_LONG) $(LIBNSS) $(LIBTCB_A)
  23 +all: $(LIBTCB_LONG) $(LIBNSS)
  24
  25  $(LIBTCB_A): libtcb_a.o
  26         ar -cr $@ $<
  27 @@ -36,9 +36,8 @@ install:
  28         $(MKDIR) -p -m 755 $(DESTDIR)$(LIBDIR)
  29         $(INSTALL) -m $(SHLIBMODE) $(LIBTCB_LONG) $(DESTDIR)$(SLIBDIR)/
  30         ln -sf $(LIBTCB_LONG) $(DESTDIR)$(SLIBDIR)/$(LIBTCB)
  31 -       ln -sf ../..$(SLIBDIR)/$(LIBTCB) $(DESTDIR)$(LIBDIR)/libtcb.so
  32 +       ln -sf $(LIBTCB) $(DESTDIR)$(LIBDIR)/libtcb.so
  33         $(INSTALL) -m $(SHLIBMODE) $(LIBNSS) $(DESTDIR)$(SLIBDIR)/
  34 -       $(INSTALL) -m 644 $(LIBTCB_A) $(DESTDIR)$(LIBDIR)/
  35
  36  clean:
  37         rm -f *.o *~ $(LIBTCB)* libtcb.so $(LIBNSS) *.a
  38 diff --git a/progs/Makefile b/progs/Makefile
  39 index c3a6879..e24f74b 100644
  40 --- a/progs/Makefile
  41 +++ b/progs/Makefile
  42 @@ -23,8 +23,8 @@ install-non-root: install-common
  43         $(INSTALL) -m 700 $(CHKPWD) $(DESTDIR)$(LIBEXECDIR)/chkpwd/
  44
  45  install: install-common
  46 -       $(INSTALL) -d -o root -g chkpwd -m 710 $(DESTDIR)$(LIBEXECDIR)/chkpwd
  47 -       $(INSTALL) -m 2711 -o root -g shadow $(CHKPWD) \
  48 +       $(INSTALL) -d $(DESTDIR)$(LIBEXECDIR)/chkpwd
  49 +       $(INSTALL) $(CHKPWD) \
  50                 $(DESTDIR)$(LIBEXECDIR)/chkpwd/
  51
  52  install-common: