From b372fd2cff0ba27db9a2e34a6bea15f1d0db9495 Mon Sep 17 00:00:00 2001 From: Lars Müller Date: Mon, 13 Mar 2006 14:22:43 +0000 Subject: r14317: Use source/bin as dir to link pam_winbind instead of source/nsswitch/ The intention is to have the resulting binaries at one place. This is also usefull for upcoming changes to provide a test_pammodules rule. With these changes I even got aware of testsuite/nsswitch/pam_winbind_syms.exp But this only covers pam_winbind. (This used to be commit 9883957b74ddefb5293e4aef0cc2f53ee4d417ac) --- packaging/Debian/debian-sarge/rules | 2 +- packaging/Debian/debian-unstable/rules | 2 +- packaging/Debian/debian-woody/rules | 2 +- packaging/RHEL/samba.spec.tmpl | 2 +- packaging/RedHat-9/samba.spec.tmpl | 2 +- packaging/Solaris/makepkg.sh | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) (limited to 'packaging') diff --git a/packaging/Debian/debian-sarge/rules b/packaging/Debian/debian-sarge/rules index 4db1aafd3ac..eb6e71c90e1 100755 --- a/packaging/Debian/debian-sarge/rules +++ b/packaging/Debian/debian-sarge/rules @@ -181,7 +181,7 @@ install: build # Install winbind stuff not installed by 'make install' install -m 0644 source/nsswitch/libnss_winbind.so \ $(DESTDIR)/lib/libnss_winbind.so.2 - install -m 0644 source/nsswitch/pam_winbind.so \ + install -m 0644 source/bin/pam_winbind.so \ $(DESTDIR)/lib/security/ # Install libnss_wins.so, which is not installed by 'make install' either. diff --git a/packaging/Debian/debian-unstable/rules b/packaging/Debian/debian-unstable/rules index 71f833d4cb2..bfc15255f33 100755 --- a/packaging/Debian/debian-unstable/rules +++ b/packaging/Debian/debian-unstable/rules @@ -176,7 +176,7 @@ install: build # Install winbind stuff not installed by 'make install' install -m 0644 source/nsswitch/libnss_winbind.so \ $(DESTDIR)/lib/libnss_winbind.so.2 - install -m 0644 source/nsswitch/pam_winbind.so \ + install -m 0644 source/bin/pam_winbind.so \ $(DESTDIR)/lib/security/ # Install libnss_wins.so, which is not installed by 'make install' either. diff --git a/packaging/Debian/debian-woody/rules b/packaging/Debian/debian-woody/rules index f17ea75c015..d97dc99bce8 100755 --- a/packaging/Debian/debian-woody/rules +++ b/packaging/Debian/debian-woody/rules @@ -147,7 +147,7 @@ install: build # Install winbind stuff not installed by 'make install' install -m 0644 source/nsswitch/libnss_winbind.so \ $(DESTDIR)/lib/libnss_winbind.so.2 - install -m 0644 source/nsswitch/pam_winbind.so \ + install -m 0644 source/bin/pam_winbind.so \ $(DESTDIR)/lib/security/ # Install libnss_wins.so, which is not installed by 'make install' either. diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl index f5302a87a72..6e5ebcb6d0b 100644 --- a/packaging/RHEL/samba.spec.tmpl +++ b/packaging/RHEL/samba.spec.tmpl @@ -211,7 +211,7 @@ cd .. cp source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_lib}/security/pam_smbpass.so # NSS & PAM winbind support -install -m 755 source/nsswitch/pam_winbind.so $RPM_BUILD_ROOT/%{_lib}/security/pam_winbind.so +install -m 755 source/bin/pam_winbind.so $RPM_BUILD_ROOT/%{_lib}/security/pam_winbind.so install -m 755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_lib}/libnss_winbind.so install -m 755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_lib}/libnss_wins.so ( cd $RPM_BUILD_ROOT/%{_lib}; diff --git a/packaging/RedHat-9/samba.spec.tmpl b/packaging/RedHat-9/samba.spec.tmpl index 6ea456c3841..e450bf512fb 100644 --- a/packaging/RedHat-9/samba.spec.tmpl +++ b/packaging/RedHat-9/samba.spec.tmpl @@ -177,7 +177,7 @@ install -m755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/lib # Install winbind shared libraries install -m755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/lib ( cd $RPM_BUILD_ROOT/lib; ln -sf libnss_winbind.so libnss_winbind.so.2 ) -install -m755 source/nsswitch/pam_winbind.so $RPM_BUILD_ROOT/lib/security +install -m755 source/bin/pam_winbind.so $RPM_BUILD_ROOT/lib/security # Install pam_smbpass.so install -m755 source/bin/pam_smbpass.so $RPM_BUILD_ROOT/lib/security diff --git a/packaging/Solaris/makepkg.sh b/packaging/Solaris/makepkg.sh index 18e9f00f84a..6a8660b350c 100644 --- a/packaging/Solaris/makepkg.sh +++ b/packaging/Solaris/makepkg.sh @@ -172,8 +172,8 @@ DOCDIR=$INSTALL_BASE/docs ## cp -fp nsswitch/libnss_wins.so $TMPINSTALLDIR/$LIBDIR/nss_wins.so.1 cp -fp nsswitch/libnss_winbind.so $TMPINSTALLDIR/$LIBDIR/nss_winbind.so.1 -if [ -f nsswitch/pam_winbind.so ]; then - cp -fp nsswitch/pam_winbind.so $TMPINSTALLDIR/$LIBDIR/pam_winbind.so +if [ -f bin/pam_winbind.so ]; then + cp -fp bin/pam_winbind.so $TMPINSTALLDIR/$LIBDIR/pam_winbind.so fi if [ -f bin/smbwrapper.so ]; then cp -fp bin/smbwrapper.so $TMPINSTALLDIR/$INSTALL_BASE/lib -- cgit