diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-21 14:51:13 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-21 14:51:13 +0200 |
commit | 5209a846a9157e649fcdcb561f7eaf19c8c0e465 (patch) | |
tree | b0a7e52b5646c8eec182dbc391e7934b6804488c /source4/smbd/config.mk | |
parent | 625359b2e266105022309df8985720108ecd6f67 (diff) | |
parent | 2ee8d29d22bcb1c350ab59d71b0aee548489bc9c (diff) | |
download | samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.tar.gz samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.tar.bz2 samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into regsrv
Conflicts:
source4/lib/registry/ldb.c
source4/rpc_server/winreg/rpc_winreg.c
Diffstat (limited to 'source4/smbd/config.mk')
-rw-r--r-- | source4/smbd/config.mk | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk index e60f444456..b5babd4d69 100644 --- a/source4/smbd/config.mk +++ b/source4/smbd/config.mk @@ -17,9 +17,7 @@ PIDFILE_OBJ_FILES = $(smbdsrcdir)/pidfile.o $(eval $(call proto_header_template,$(smbdsrcdir)/pidfile.h,$(PIDFILE_OBJ_FILES:.o=.c))) -################################# -# Start BINARY smbd -[BINARY::smbd] +[BINARY::samba] INSTALLDIR = SBINDIR PRIVATE_DEPENDENCIES = \ process_model \ @@ -36,8 +34,6 @@ PRIVATE_DEPENDENCIES = \ share \ CLUSTER -smbd_OBJ_FILES = $(smbdsrcdir)/server.o +samba_OBJ_FILES = $(smbdsrcdir)/server.o -MANPAGES += $(smbdsrcdir)/smbd.8 -# End BINARY smbd -################################# +MANPAGES += $(smbdsrcdir)/samba.8 |