diff options
| author | Andrew Tridgell <tridge@samba.org> | 2000-05-10 09:49:55 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2000-05-10 09:49:55 +0000 |
| commit | ddc9b8b40642c90fe7c34b088eae4f8075f4033a (patch) | |
| tree | 56c378815bdf109d13b1d4e5b51f0e1ea313a58d /source3/Makefile.in | |
| parent | 6cf96ff43155346589e19c1bb2fd723be74f1f12 (diff) | |
| download | samba-ddc9b8b40642c90fe7c34b088eae4f8075f4033a.tar.gz samba-ddc9b8b40642c90fe7c34b088eae4f8075f4033a.tar.bz2 samba-ddc9b8b40642c90fe7c34b088eae4f8075f4033a.zip | |
more merging
it is now at the stage that winbindd can compile in the head branch,
but not link
(This used to be commit d178c00aae77710ae6ff20a7f54a30e3bd8232bb)
Diffstat (limited to 'source3/Makefile.in')
| -rw-r--r-- | source3/Makefile.in | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 15fbdd3b71..fa497c62f9 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -41,8 +41,7 @@ INSTALLPERMS = 0755 # set these to where to find various files # These can be overridden by command line switches (see smbd(8)) # or in smb.conf (see smb.conf(5)) -SMBLOGFILE = $(VARDIR)/log.smb -NMBLOGFILE = $(VARDIR)/log.nmb +LOGFILEBASE = $(VARDIR) CONFIGFILE = $(LIBDIR)/smb.conf LMHOSTSFILE = $(LIBDIR)/lmhosts DRIVERFILE = $(LIBDIR)/printers.def @@ -75,7 +74,7 @@ SMBRUN = $(BINDIR)/smbrun PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" -FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -DSMBLOGFILE=\"$(SMBLOGFILE)\" -DNMBLOGFILE=\"$(NMBLOGFILE)\" +FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -DLOGFILEBASE=\"$(LOGFILEBASE)\" FLAGS2 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\" FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\" FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\" -DFORMSFILE=\"$(FORMSFILE)\" -DNTDRIVERSDIR=\"$(NTDRIVERSDIR)\" |