diff options
author | Herb Lewis <herb@samba.org> | 2003-06-07 00:50:36 +0000 |
---|---|---|
committer | Herb Lewis <herb@samba.org> | 2003-06-07 00:50:36 +0000 |
commit | ed08494cffd894030234b30796b7ce47cf87f94c (patch) | |
tree | 9e8125313fa297d5edcd5366240a989fdaa9d480 /packaging | |
parent | a26ed5e8a4fa085044deae9f189b7132bd33eb52 (diff) | |
download | samba-ed08494cffd894030234b30796b7ce47cf87f94c.tar.gz |
merge from 3.0
Diffstat (limited to 'packaging')
-rwxr-xr-x | packaging/SGI/idb.pl | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/packaging/SGI/idb.pl b/packaging/SGI/idb.pl index 72f573b8ee1..529695b14b2 100755 --- a/packaging/SGI/idb.pl +++ b/packaging/SGI/idb.pl @@ -132,9 +132,6 @@ while(@bins) { if ($filename eq "smbpasswd") { print IDB "f 0755 root sys usr/samba/bin/$filename $SRCPFX/source/$nextfile $PKG.sw.base \n"; } - elsif ($filename eq "findsmb") { - print IDB "f 0755 root sys usr/samba/bin/$filename $SRCPFX/packaging/SGI/$filename $PKG.sw.base\n"; - } elsif ($filename eq "swat") { print IDB "f 4755 root sys usr/samba/bin/$filename $SRCPFX/source/$nextfile $PKG.sw.base preop(\"chroot \$rbase /etc/init.d/samba stop\") exitop(\"chroot \$rbase /usr/samba/scripts/startswat.sh\") removeop(\"chroot \$rbase /sbin/cp /etc/inetd.conf /etc/inetd.conf.O ; chroot \$rbase /sbin/sed -e '/^swat/D' -e '/^#SWAT/D' /etc/inetd.conf.O >/etc/inetd.conf; /etc/killall -HUP inetd || true\")\n"; } @@ -368,11 +365,11 @@ sub get_line { $_ = <MAKEFILE>; chomp; s/^\s*/ /; - substr($line,$cont,1,$_); + substr($line,$cont,1) = $_; } $line =~ s/\$\(EXEEXT\)/$EXEEXT/g; - $line =~ s/\$\(srcdir\)/$srcdir/g; - $line =~ s/\$\(builddir\)/$builddir/g; + $line =~ s/\$\(srcdir\)//g; + $line =~ s/\$\(builddir\)//g; $line =~ s/\$\(\S*\)\s*//g; $line =~ s/\s\s*/ /g; @line = split(' ',$line); |