2005-04-22  Dmitry V. Levin  <ldv@altlinux.org>

	Better multilib support.

	* Make.defs: New variables: SLIBDIR and LIBDIR.

	* libs/Makefile, pam_tcb/Makefile: Use them.

	* libs/Makefile, pam_tcb/Makefile, misc/Makefile, progs/Makefile:

	Create all necessary directories in the beginning of install

	target.

diff -urk.orig tcb-0.9.8.8.orig/Make.defs tcb-0.9.8.8/Make.defs

--- tcb-0.9.8.8.orig/Make.defs	2002-05-19 07:54:50 +0400

+++ tcb-0.9.8.8/Make.defs	2005-04-23 14:27:13 +0400

@@ -8,6 +8,8 @@

 LDFLAGS += $(DBGFLAG) -L../libs

 SBINDIR = /sbin

+SLIBDIR = /lib

+LIBDIR = /usr/lib

 LIBEXECDIR = /usr/libexec

 MANDIR = /usr/man

diff -urk.orig tcb-0.9.8.8.orig/libs/Makefile tcb-0.9.8.8/libs/Makefile

--- tcb-0.9.8.8.orig/libs/Makefile	2003-11-03 14:49:54 +0300

+++ tcb-0.9.8.8/libs/Makefile	2005-04-23 14:27:13 +0400

@@ -28,11 +28,13 @@

 install-non-root: install

 install:

-	install -m $(SHLIBMODE) $(LIBTCB_LONG) $(DESTDIR)/lib/

-	ln -sf $(LIBTCB_LONG) $(DESTDIR)/lib/$(LIBTCB)

-	ln -sf ../../lib/$(LIBTCB) $(DESTDIR)/usr/lib/libtcb.so

-	install -m $(SHLIBMODE) $(LIBNSS) $(DESTDIR)/lib/

-	install -m 644 $(LIBTCB_A) $(DESTDIR)/usr/lib/

+	mkdir -p $(DESTDIR)$(SLIBDIR)

+	mkdir -p $(DESTDIR)$(LIBDIR)

+	install -m $(SHLIBMODE) $(LIBTCB_LONG) $(DESTDIR)$(SLIBDIR)/

+	ln -sf $(LIBTCB_LONG) $(DESTDIR)$(SLIBDIR)/$(LIBTCB)

+	ln -sf ../..$(SLIBDIR)/$(LIBTCB) $(DESTDIR)$(LIBDIR)/libtcb.so

+	install -m $(SHLIBMODE) $(LIBNSS) $(DESTDIR)$(SLIBDIR)/

+	install -m 644 $(LIBTCB_A) $(DESTDIR)$(LIBDIR)/

 clean:

 	rm -f *.o *~ $(LIBTCB)* libtcb.so $(LIBNSS) *.a

diff -urk.orig tcb-0.9.8.8.orig/pam_tcb/Makefile tcb-0.9.8.8/pam_tcb/Makefile

--- tcb-0.9.8.8.orig/pam_tcb/Makefile	2003-11-03 14:49:54 +0300

+++ tcb-0.9.8.8/pam_tcb/Makefile	2005-04-23 14:28:22 +0400

@@ -23,16 +23,17 @@

 install-non-root: install

 install:

-	mkdir -p $(DESTDIR)/lib/security

-	install -m $(SHLIBMODE) $(PAM_TCB) $(DESTDIR)/lib/security/

+	mkdir -p $(DESTDIR)$(SLIBDIR)/security

+	mkdir -p $(DESTDIR)$(MANDIR)/man8

+	install -m $(SHLIBMODE) $(PAM_TCB) $(DESTDIR)$(SLIBDIR)/security/

 	install -m 644 pam_tcb.8 $(DESTDIR)$(MANDIR)/man8/

-install-pam_unix:

-	ln -s $(PAM_TCB) $(DESTDIR)/lib/security/pam_unix.so

-	ln -s $(PAM_TCB) $(DESTDIR)/lib/security/pam_unix_acct.so

-	ln -s $(PAM_TCB) $(DESTDIR)/lib/security/pam_unix_auth.so

-	ln -s $(PAM_TCB) $(DESTDIR)/lib/security/pam_unix_passwd.so

-	ln -s $(PAM_TCB) $(DESTDIR)/lib/security/pam_unix_session.so

+install-pam_unix: install

+	ln -s $(PAM_TCB) $(DESTDIR)$(SLIBDIR)/security/pam_unix.so

+	ln -s $(PAM_TCB) $(DESTDIR)$(SLIBDIR)/security/pam_unix_acct.so

+	ln -s $(PAM_TCB) $(DESTDIR)$(SLIBDIR)/security/pam_unix_auth.so

+	ln -s $(PAM_TCB) $(DESTDIR)$(SLIBDIR)/security/pam_unix_passwd.so

+	ln -s $(PAM_TCB) $(DESTDIR)$(SLIBDIR)/security/pam_unix_session.so

 	install -m 644 pam_unix.8 $(DESTDIR)$(MANDIR)/man8/

 clean:

diff -urk.orig tcb-0.9.8.8.orig/misc/Makefile tcb-0.9.8.8/misc/Makefile

--- tcb-0.9.8.8.orig/misc/Makefile	2003-11-03 14:49:54 +0300

+++ tcb-0.9.8.8/misc/Makefile	2005-04-23 14:27:13 +0400

@@ -5,11 +5,8 @@

 install-non-root: install

 install:

-	mkdir -p $(DESTDIR)/lib

-	mkdir -p $(DESTDIR)$(SBINDIR)

-	mkdir -p $(DESTDIR)$(LIBEXECDIR)

-	mkdir -p $(DESTDIR)$(MANDIR)/man{5,8}

-	mkdir -p $(DESTDIR)/usr/{lib,include}

+	mkdir -p $(DESTDIR)$(MANDIR)/man5

+	mkdir -p $(DESTDIR)/usr/include

 	install -m 644 tcb.5 $(DESTDIR)$(MANDIR)/man5/

 	install -m 644 ../include/tcb.h $(DESTDIR)/usr/include/

diff -urk.orig tcb-0.9.8.8.orig/progs/Makefile tcb-0.9.8.8/progs/Makefile

--- tcb-0.9.8.8.orig/progs/Makefile	2003-11-03 14:49:54 +0300

+++ tcb-0.9.8.8/progs/Makefile	2005-04-23 14:27:13 +0400

@@ -28,6 +28,8 @@

 		$(DESTDIR)$(LIBEXECDIR)/chkpwd/

 install-common:

+	mkdir -p $(DESTDIR)$(SBINDIR)

+	mkdir -p $(DESTDIR)$(MANDIR)/man8

 	install -m 700 $(CONVERT) $(DESTDIR)$(SBINDIR)/

 	install -m 700 $(UNCONVERT) $(DESTDIR)$(SBINDIR)/

 	install -m 644 $(CONVERT).8 $(DESTDIR)$(MANDIR)/man8/