Annotation of /trunk/samba/patches/samba-3.0.23c-subins-makefile.patch
Parent Directory
| 
Revision Log
Revision 153 -
(hide annotations)
(download)
Tue May 8 20:52:56 2007 UTC (17 years, 1 month ago) by niro
File size: 4034 byte(s)
Tue May 8 20:52:56 2007 UTC (17 years, 1 month ago) by niro
File size: 4034 byte(s)
-import
| 1 | niro | 153 | --- source/Makefile.in.orig 2006-07-12 09:44:38.000000000 +0200 |
| 2 | +++ source/Makefile.in 2006-07-12 09:52:41.000000000 +0200 | ||
| 3 | @@ -29,6 +29,7 @@ | ||
| 4 | PYTHON=@PYTHON@ | ||
| 5 | PERL=@PERL@ | ||
| 6 | |||
| 7 | +LAZYLDFLAGS=-Wl,-z,now | ||
| 8 | TERMLDFLAGS=@TERMLDFLAGS@ | ||
| 9 | TERMLIBS=@TERMLIBS@ | ||
| 10 | PRINT_LIBS=@PRINT_LIBS@ | ||
| 11 | @@ -81,6 +82,9 @@ | ||
| 12 | # The permissions to give the executables | ||
| 13 | INSTALLPERMS = 0755 | ||
| 14 | |||
| 15 | +# The permissions for setuid executables | ||
| 16 | +INSTALLSUPERMS = 4755 | ||
| 17 | + | ||
| 18 | # set these to where to find various files | ||
| 19 | # These can be overridden by command line switches (see smbd(8)) | ||
| 20 | # or in smb.conf (see smb.conf(5)) | ||
| 21 | @@ -136,7 +140,7 @@ | ||
| 22 | |||
| 23 | SBIN_PROGS = bin/smbd@EXEEXT@ bin/nmbd@EXEEXT@ bin/swat@EXEEXT@ @EXTRA_SBIN_PROGS@ | ||
| 24 | |||
| 25 | -ROOT_SBIN_PROGS = @CIFSMOUNT_PROGS@ | ||
| 26 | +SUBIN_PROGS = @CIFSMOUNT_PROGS@ @EXTRA_SUBIN_PROGS@ | ||
| 27 | |||
| 28 | BIN_PROGS1 = bin/smbclient@EXEEXT@ bin/net@EXEEXT@ bin/smbspool@EXEEXT@ \ | ||
| 29 | bin/testparm@EXEEXT@ bin/smbstatus@EXEEXT@ bin/smbget@EXEEXT@ | ||
| 30 | @@ -765,7 +769,7 @@ | ||
| 31 | ###################################################################### | ||
| 32 | # now the rules... | ||
| 33 | ###################################################################### | ||
| 34 | -all : SHOWFLAGS proto_exists $(SBIN_PROGS) $(BIN_PROGS) $(ROOT_SBIN_PROGS) \ | ||
| 35 | +all : SHOWFLAGS proto_exists $(SBIN_PROGS) $(BIN_PROGS) $(SUBIN_PROGS) \ | ||
| 36 | $(SHLIBS) $(MODULES) $(PAM_MODULES) @EXTRA_ALL_TARGETS@ | ||
| 37 | |||
| 38 | pam_modules : $(PAM_MODULES) | ||
| 39 | @@ -953,19 +957,19 @@ | ||
| 40 | |||
| 41 | bin/smbmnt@EXEEXT@: $(MNT_OBJ) bin/.dummy | ||
| 42 | @echo Linking $@ | ||
| 43 | - @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(MNT_OBJ) $(DYNEXP) $(LDFLAGS) | ||
| 44 | + @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(MNT_OBJ) $(DYNEXP) $(LDFLAGS) $(LAZYLDFLAGS) | ||
| 45 | |||
| 46 | bin/smbumount@EXEEXT@: $(UMOUNT_OBJ) bin/.dummy | ||
| 47 | @echo Linking $@ | ||
| 48 | - @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS) | ||
| 49 | + @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS) $(LAZYLDFLAGS) | ||
| 50 | |||
| 51 | bin/mount.cifs@EXEEXT@: $(CIFS_MOUNT_OBJ) bin/.dummy | ||
| 52 | @echo Linking $@ | ||
| 53 | - @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(CIFS_MOUNT_OBJ) $(DYNEXP) $(LDFLAGS) | ||
| 54 | + @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(CIFS_MOUNT_OBJ) $(DYNEXP) $(LDFLAGS) $(LAZYLDFLAGS) | ||
| 55 | |||
| 56 | bin/umount.cifs@EXEEXT@: $(CIFS_UMOUNT_OBJ) bin/.dummy | ||
| 57 | @echo Linking $@ | ||
| 58 | - @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(CIFS_UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS) | ||
| 59 | + @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(CIFS_UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS) $(LAZYLDFLAGS) | ||
| 60 | |||
| 61 | bin/testparm@EXEEXT@: $(TESTPARM_OBJ) @BUILD_POPT@ bin/.dummy | ||
| 62 | @echo Linking $@ | ||
| 63 | @@ -1410,7 +1414,7 @@ | ||
| 64 | @echo Linking $@ | ||
| 65 | @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) script/tests/timelimit.o | ||
| 66 | |||
| 67 | -install: installservers installbin @INSTALL_CIFSMOUNT@ installman installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@ @INSTALL_LIBMSRPC@ @INSTALL_PAM_MODULES@ | ||
| 68 | +install: installservers installbin @INSTALL_CIFSMOUNT@ installman installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@ @INSTALL_LIBMSRPC@ @INSTALL_PAM_MODULES@ installsubin | ||
| 69 | |||
| 70 | install-everything: install installmodules | ||
| 71 | |||
| 72 | @@ -1431,9 +1435,12 @@ | ||
| 73 | installbin: all installdirs | ||
| 74 | @$(SHELL) script/installbin.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(BINDIR) $(BIN_PROGS) | ||
| 75 | |||
| 76 | +installsubin: all installdirs | ||
| 77 | + @$(SHELL) script/installbin.sh $(INSTALLSUPERMS) $(DESTDIR) $(prefix) $(BINDIR) $(SUBIN_PROGS) | ||
| 78 | + | ||
| 79 | installcifsmount: @CIFSMOUNT_PROGS@ | ||
| 80 | @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR) $(ROOTSBINDIR) | ||
| 81 | - @$(SHELL) script/installbin.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(ROOTSBINDIR) @CIFSMOUNT_PROGS@ | ||
| 82 | + @$(SHELL) script/installbin.sh $(INSTALLSUPERMS) $(DESTDIR) $(prefix) $(ROOTSBINDIR) @CIFSMOUNT_PROGS@ | ||
| 83 | |||
| 84 | # Some symlinks are required for the 'probing' of modules. | ||
| 85 | # This mechanism should go at some point.. | ||
| 86 | @@ -1595,7 +1602,7 @@ | ||
| 87 | |||
| 88 | clean: delheaders python_clean | ||
| 89 | -rm -f core */*~ *~ */*.o */*.@PICSUFFIX@ */*.@SHLIBEXT@ \ | ||
| 90 | - $(TOPFILES) $(BIN_PROGS) $(SBIN_PROGS) $(ROOT_SBIN_PROGS) \ | ||
| 91 | + $(TOPFILES) $(BIN_PROGS) $(SBIN_PROGS) $(SUBIN_PROGS) \ | ||
| 92 | $(MODULES) $(TORTURE_PROGS) $(LIBSMBCLIENT) \ | ||
| 93 | $(LIBSMBSHAREMODES) $(EVERYTHING_PROGS) $(LIBMSRPC) \ | ||
| 94 | .headers.stamp */src/*.o */src/*.@PICSUFFIX@ |