mirror of
https://github.com/samba-team/samba.git
synced 2025-02-25 17:57:42 +03:00
Updated makefile-path info contributed on the samba-technical mailing list.
(This used to be commit bd3770235dd417d06e47d1ba16bcedc8a94e9ff9)
This commit is contained in:
parent
ddfe1d35fc
commit
e566f0eae0
@ -1,34 +1,44 @@
|
||||
--- samba-2.0.0/source/Makefile.in.orig Tue Dec 1 22:32:20 1998
|
||||
+++ samba-2.0.0/source/Makefile.in Wed Dec 2 17:11:33 1998
|
||||
@@ -25,9 +25,9 @@
|
||||
BINDIR = @bindir@
|
||||
# we don't use sbindir because we want full compatibility with
|
||||
diff -uNr samba-PVERSION/source/Makefile.in samba-kgc/source/Makefile.in
|
||||
--- samba-PVERSION/source/Makefile.in Wed Dec 2 14:35:18 1998
|
||||
+++ samba-kgc/source/Makefile.in Wed Dec 2 15:06:02 1998
|
||||
@@ -27,7 +27,7 @@
|
||||
# the previous releases of Samba
|
||||
-SBINDIR = @bindir@
|
||||
+SBINDIR = @sbindir@
|
||||
SBINDIR = @bindir@
|
||||
LIBDIR = @libdir@
|
||||
-VARDIR = @localstatedir@
|
||||
+VARDIR = /var/log/samba
|
||||
-VARDIR = $(BASEDIR)/var
|
||||
+VARDIR = /var
|
||||
MANDIR = @mandir@
|
||||
|
||||
# The permissions to give the executables
|
||||
@@ -43,16 +43,16 @@
|
||||
@@ -36,23 +36,23 @@
|
||||
# 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
|
||||
+SMBLOGFILE = $(VARDIR)/log/samba/log.smb
|
||||
+NMBLOGFILE = $(VARDIR)/log/samba/log.nmb
|
||||
CONFIGFILE = $(LIBDIR)/smb.conf
|
||||
LMHOSTSFILE = $(LIBDIR)/lmhosts
|
||||
DRIVERFILE = $(LIBDIR)/printers.def
|
||||
PASSWD_PROGRAM = /bin/passwd
|
||||
# This is where smbpasswd et al go
|
||||
-PRIVATEDIR = @privatedir@
|
||||
+PRIVATEDIR = $(LIBDIR)
|
||||
|
||||
SMB_PASSWD_FILE = $(PRIVATEDIR)/smbpasswd
|
||||
SMB_PASSGRP_FILE = $(PRIVATEDIR)/smbpassgrp
|
||||
-SMB_PASSWD_FILE = $(BASEDIR)/private/smbpasswd
|
||||
-SMB_PASSGRP_FILE = $(BASEDIR)/private/smbpassgrp
|
||||
-SMB_GROUP_FILE = $(BASEDIR)/private/smbgroup
|
||||
-SMB_ALIAS_FILE = $(BASEDIR)/private/smbalias
|
||||
+SMB_PASSWD_FILE = $(LIBDIR)/smbpasswd
|
||||
+SMB_PASSGRP_FILE = $(LIBDIR)/smbpassgrp
|
||||
+SMB_GROUP_FILE = $(LIBDIR)/smbgroup
|
||||
+SMB_ALIAS_FILE = $(LIBDIR)/smbalias
|
||||
SMB_PASSWD_PROGRAM = $(BINDIR)/smbpasswd
|
||||
|
||||
# This is where SWAT images and help files go
|
||||
-SWATDIR = @swatdir@
|
||||
+SWATDIR = /usr/share/swat
|
||||
-SWATDIR = $(BASEDIR)/swat
|
||||
+SWATDIR = $(BASEDIR)/share/swat
|
||||
|
||||
# the directory where lock files go
|
||||
-LOCKDIR = $(VARDIR)/locks
|
||||
+LOCKDIR = /var/lock/samba
|
||||
+LOCKDIR = $(VARDIR)/lock/samba
|
||||
|
||||
# The directory where code page definition files go
|
||||
CODEPAGEDIR = $(LIBDIR)/codepages
|
||||
|
@ -1,34 +1,44 @@
|
||||
--- samba-2.0.0/source/Makefile.in.orig Tue Dec 1 22:32:20 1998
|
||||
+++ samba-2.0.0/source/Makefile.in Wed Dec 2 17:11:33 1998
|
||||
@@ -25,9 +25,9 @@
|
||||
BINDIR = @bindir@
|
||||
# we don't use sbindir because we want full compatibility with
|
||||
diff -uNr samba-PVERSION/source/Makefile.in samba-kgc/source/Makefile.in
|
||||
--- samba-PVERSION/source/Makefile.in Wed Dec 2 14:35:18 1998
|
||||
+++ samba-kgc/source/Makefile.in Wed Dec 2 15:06:02 1998
|
||||
@@ -27,7 +27,7 @@
|
||||
# the previous releases of Samba
|
||||
-SBINDIR = @bindir@
|
||||
+SBINDIR = @sbindir@
|
||||
SBINDIR = @bindir@
|
||||
LIBDIR = @libdir@
|
||||
-VARDIR = @localstatedir@
|
||||
+VARDIR = /var/log/samba
|
||||
-VARDIR = $(BASEDIR)/var
|
||||
+VARDIR = /var
|
||||
MANDIR = @mandir@
|
||||
|
||||
# The permissions to give the executables
|
||||
@@ -43,16 +43,16 @@
|
||||
@@ -36,23 +36,23 @@
|
||||
# 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
|
||||
+SMBLOGFILE = $(VARDIR)/log/samba/log.smb
|
||||
+NMBLOGFILE = $(VARDIR)/log/samba/log.nmb
|
||||
CONFIGFILE = $(LIBDIR)/smb.conf
|
||||
LMHOSTSFILE = $(LIBDIR)/lmhosts
|
||||
DRIVERFILE = $(LIBDIR)/printers.def
|
||||
PASSWD_PROGRAM = /bin/passwd
|
||||
# This is where smbpasswd et al go
|
||||
-PRIVATEDIR = @privatedir@
|
||||
+PRIVATEDIR = $(LIBDIR)
|
||||
|
||||
SMB_PASSWD_FILE = $(PRIVATEDIR)/smbpasswd
|
||||
SMB_PASSGRP_FILE = $(PRIVATEDIR)/smbpassgrp
|
||||
-SMB_PASSWD_FILE = $(BASEDIR)/private/smbpasswd
|
||||
-SMB_PASSGRP_FILE = $(BASEDIR)/private/smbpassgrp
|
||||
-SMB_GROUP_FILE = $(BASEDIR)/private/smbgroup
|
||||
-SMB_ALIAS_FILE = $(BASEDIR)/private/smbalias
|
||||
+SMB_PASSWD_FILE = $(LIBDIR)/smbpasswd
|
||||
+SMB_PASSGRP_FILE = $(LIBDIR)/smbpassgrp
|
||||
+SMB_GROUP_FILE = $(LIBDIR)/smbgroup
|
||||
+SMB_ALIAS_FILE = $(LIBDIR)/smbalias
|
||||
SMB_PASSWD_PROGRAM = $(BINDIR)/smbpasswd
|
||||
|
||||
# This is where SWAT images and help files go
|
||||
-SWATDIR = @swatdir@
|
||||
+SWATDIR = /usr/share/swat
|
||||
-SWATDIR = $(BASEDIR)/swat
|
||||
+SWATDIR = $(BASEDIR)/share/swat
|
||||
|
||||
# the directory where lock files go
|
||||
-LOCKDIR = $(VARDIR)/locks
|
||||
+LOCKDIR = /var/lock/samba
|
||||
+LOCKDIR = $(VARDIR)/lock/samba
|
||||
|
||||
# The directory where code page definition files go
|
||||
CODEPAGEDIR = $(LIBDIR)/codepages
|
||||
|
@ -1,34 +1,44 @@
|
||||
--- samba-2.0.0/source/Makefile.in.orig Tue Dec 1 22:32:20 1998
|
||||
+++ samba-2.0.0/source/Makefile.in Wed Dec 2 17:11:33 1998
|
||||
@@ -25,9 +25,9 @@
|
||||
BINDIR = @bindir@
|
||||
# we don't use sbindir because we want full compatibility with
|
||||
diff -uNr samba-PVERSION/source/Makefile.in samba-kgc/source/Makefile.in
|
||||
--- samba-PVERSION/source/Makefile.in Wed Dec 2 14:35:18 1998
|
||||
+++ samba-kgc/source/Makefile.in Wed Dec 2 15:06:02 1998
|
||||
@@ -27,7 +27,7 @@
|
||||
# the previous releases of Samba
|
||||
-SBINDIR = @bindir@
|
||||
+SBINDIR = @sbindir@
|
||||
SBINDIR = @bindir@
|
||||
LIBDIR = @libdir@
|
||||
-VARDIR = @localstatedir@
|
||||
+VARDIR = /var/log/samba
|
||||
-VARDIR = $(BASEDIR)/var
|
||||
+VARDIR = /var
|
||||
MANDIR = @mandir@
|
||||
|
||||
# The permissions to give the executables
|
||||
@@ -43,16 +43,16 @@
|
||||
@@ -36,23 +36,23 @@
|
||||
# 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
|
||||
+SMBLOGFILE = $(VARDIR)/log/samba/log.smb
|
||||
+NMBLOGFILE = $(VARDIR)/log/samba/log.nmb
|
||||
CONFIGFILE = $(LIBDIR)/smb.conf
|
||||
LMHOSTSFILE = $(LIBDIR)/lmhosts
|
||||
DRIVERFILE = $(LIBDIR)/printers.def
|
||||
PASSWD_PROGRAM = /bin/passwd
|
||||
# This is where smbpasswd et al go
|
||||
-PRIVATEDIR = @privatedir@
|
||||
+PRIVATEDIR = $(LIBDIR)
|
||||
|
||||
SMB_PASSWD_FILE = $(PRIVATEDIR)/smbpasswd
|
||||
SMB_PASSGRP_FILE = $(PRIVATEDIR)/smbpassgrp
|
||||
-SMB_PASSWD_FILE = $(BASEDIR)/private/smbpasswd
|
||||
-SMB_PASSGRP_FILE = $(BASEDIR)/private/smbpassgrp
|
||||
-SMB_GROUP_FILE = $(BASEDIR)/private/smbgroup
|
||||
-SMB_ALIAS_FILE = $(BASEDIR)/private/smbalias
|
||||
+SMB_PASSWD_FILE = $(LIBDIR)/smbpasswd
|
||||
+SMB_PASSGRP_FILE = $(LIBDIR)/smbpassgrp
|
||||
+SMB_GROUP_FILE = $(LIBDIR)/smbgroup
|
||||
+SMB_ALIAS_FILE = $(LIBDIR)/smbalias
|
||||
SMB_PASSWD_PROGRAM = $(BINDIR)/smbpasswd
|
||||
|
||||
# This is where SWAT images and help files go
|
||||
-SWATDIR = @swatdir@
|
||||
+SWATDIR = /usr/share/swat
|
||||
-SWATDIR = $(BASEDIR)/swat
|
||||
+SWATDIR = $(BASEDIR)/share/swat
|
||||
|
||||
# the directory where lock files go
|
||||
-LOCKDIR = $(VARDIR)/locks
|
||||
+LOCKDIR = /var/lock/samba
|
||||
+LOCKDIR = $(VARDIR)/lock/samba
|
||||
|
||||
# The directory where code page definition files go
|
||||
CODEPAGEDIR = $(LIBDIR)/codepages
|
||||
|
Loading…
x
Reference in New Issue
Block a user