summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarolin Seeger <kseeger@samba.org>2009-06-17 15:21:24 +0200
committerKarolin Seeger <kseeger@samba.org>2009-07-27 15:55:08 +0200
commite32b4c894d19010ceeb8a01a15f1b11e05282fe8 (patch)
tree75e1ffd0c8ee19d8d81ff6a6a3a5b113ed91c2a3
parent693f82492ac980377860886cc32a30a20777bd13 (diff)
downloadsamba-e32b4c894d19010ceeb8a01a15f1b11e05282fe8.tar.gz
Revert "s3/packaging: source -> source3"
This reverts commit 646d465780fd0afea2454cf2e1c732c39a93491e. Pushed by accident... (cherry picked from commit 8cf6e03e9ebffa759a2a66339124492ef3e8d26f)
-rw-r--r--packaging/RHEL/samba.spec.tmpl14
1 files changed, 7 insertions, 7 deletions
diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index 15deecd75a8..22f29fbb0df 100644
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -118,7 +118,7 @@ utilized by SWAT as well as the HTML and PDF version of "Using Samba",
/bin/cp setup/filter-requires-samba.sh %{SOURCE998}
-cd source3
+cd source
# RPM_OPT_FLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64"
## check for ccache
@@ -204,14 +204,14 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d
mkdir -p $RPM_BUILD_ROOT/var/lib/samba/winbindd_privileged
mkdir -p $RPM_BUILD_ROOT/var/{log,run/winbindd,spool}/samba
-cd source3
+cd source
make DESTDIR=$RPM_BUILD_ROOT \
install
cd ..
# NSS winbind support
-install -m 755 source3/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_libarch}/libnss_winbind.so.2
-install -m 755 source3/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_libarch}/libnss_wins.so.2
+install -m 755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_libarch}/libnss_winbind.so.2
+install -m 755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_libarch}/libnss_wins.so.2
( cd $RPM_BUILD_ROOT/%{_libarch};
ln -sf libnss_winbind.so.2 libnss_winbind.so;
ln -sf libnss_wins.so.2 libnss_wins.so )
@@ -231,9 +231,9 @@ install -m644 setup/samba.pamd $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/samba
install -m755 setup/smbprint $RPM_BUILD_ROOT%{_bindir}
install -m644 setup/smbusers $RPM_BUILD_ROOT%{_sysconfdir}/samba/smbusers
install -m644 setup/smb.conf $RPM_BUILD_ROOT%{_sysconfdir}/samba/smb.conf
-install -m755 source3/bin/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
-install -m755 source3/bin/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
-install -m755 source3/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
+install -m755 source/bin/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
+install -m755 source/bin/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
+install -m755 source/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
/bin/rm $RPM_BUILD_ROOT%{_sbindir}/*mount.cifs