mirror of
https://github.com/samba-team/samba.git
synced 2024-12-23 17:34:34 +03:00
(Hopefully) correct patch files for RedHat & TurboLinux.
In fixing this I have learned more about RPM than I *ever* wanted to know.... Jeremy.
This commit is contained in:
Jeremy Allison
parent
a0adae90ca
commit
765989e415
@ -1,43 +1,70 @@
|
||||
--- samba-2.0.0/source/Makefile.in.orig Sat Aug 22 02:48:36 1998
|
||||
+++ samba-2.0.0/source/Makefile.in Fri Aug 21 22:19:32 1998
|
||||
@@ -23,11 +23,11 @@
|
||||
.SUFFIXES:
|
||||
.SUFFIXES: .c .o
|
||||
|
||||
-BASEDIR=$(prefix)/samba
|
||||
+BASEDIR= /usr
|
||||
BINDIR = $(BASEDIR)/bin
|
||||
-SBINDIR = $(BASEDIR)/bin
|
||||
-LIBDIR = $(BASEDIR)/lib
|
||||
-VARDIR = $(BASEDIR)/var
|
||||
+SBINDIR = $(BASEDIR)/sbin
|
||||
+LIBDIR = /etc
|
||||
+VARDIR = /var
|
||||
MANDIR = $(BASEDIR)/man
|
||||
|
||||
# The permissions to give the executables
|
||||
@@ -36,19 +36,19 @@
|
||||
# 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
|
||||
-SMB_PASSWD_FILE = $(BASEDIR)/private/smbpasswd
|
||||
+SMB_PASSWD_FILE = $(LIBDIR)/smbpasswd
|
||||
|
||||
# This is where SWAT images and help files go
|
||||
-SWATDIR = $(BASEDIR)/swat
|
||||
+SWATDIR = $(BASEDIR)/share/swat
|
||||
|
||||
# the directory where lock files go
|
||||
-LOCKDIR = $(VARDIR)/locks
|
||||
+LOCKDIR = $(VARDIR)/lock/samba
|
||||
|
||||
# The directory where code page definition files go
|
||||
CODEPAGEDIR = $(LIBDIR)/codepages
|
||||
--- samba-2.0.0/source/Makefile.in.orig Sat Aug 22 02:48:36 1998
|
||||
+++ samba-2.0.0/source/Makefile.in Fri Aug 21 22:19:32 1998
|
||||
***************
|
||||
*** 22,32 ****
|
||||
builddir=@builddir@
|
||||
SHELL=/bin/sh
|
||||
|
||||
! BASEDIR=$(prefix)/samba
|
||||
BINDIR = $(BASEDIR)/bin
|
||||
! SBINDIR = $(BASEDIR)/bin
|
||||
! LIBDIR = $(BASEDIR)/lib
|
||||
! VARDIR = $(BASEDIR)/var
|
||||
MANDIR = $(BASEDIR)/man
|
||||
|
||||
# The permissions to give the executables
|
||||
--- 22,32 ----
|
||||
builddir=@builddir@
|
||||
SHELL=/bin/sh
|
||||
|
||||
! BASEDIR=/usr
|
||||
BINDIR = $(BASEDIR)/bin
|
||||
! SBINDIR = $(BASEDIR)/sbin
|
||||
! LIBDIR = /etc
|
||||
! VARDIR = /var
|
||||
MANDIR = $(BASEDIR)/man
|
||||
|
||||
# The permissions to give the executables
|
||||
***************
|
||||
*** 35,54 ****
|
||||
# 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
|
||||
CONFIGFILE = $(LIBDIR)/smb.conf
|
||||
LMHOSTSFILE = $(LIBDIR)/lmhosts
|
||||
DRIVERFILE = $(LIBDIR)/printers.def
|
||||
PASSWD_PROGRAM = /bin/passwd
|
||||
! SMB_PASSWD_FILE = $(BASEDIR)/private/smbpasswd
|
||||
SMB_PASSWD_PROGRAM = $(BASEDIR)/bin/smbpasswd
|
||||
|
||||
# This is where SWAT images and help files go
|
||||
! SWATDIR = $(BASEDIR)/swat
|
||||
|
||||
# the directory where lock files go
|
||||
! LOCKDIR = $(VARDIR)/locks
|
||||
|
||||
# The directory where code page definition files go
|
||||
CODEPAGEDIR = $(LIBDIR)/codepages
|
||||
--- 35,54 ----
|
||||
# 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/samba/log.smb
|
||||
! NMBLOGFILE = $(VARDIR)/log/samba/log.nmb
|
||||
CONFIGFILE = $(LIBDIR)/smb.conf
|
||||
LMHOSTSFILE = $(LIBDIR)/lmhosts
|
||||
DRIVERFILE = $(LIBDIR)/printers.def
|
||||
PASSWD_PROGRAM = /bin/passwd
|
||||
! SMB_PASSWD_FILE = $(LIBDIR)/smbpasswd
|
||||
SMB_PASSWD_PROGRAM = $(BASEDIR)/bin/smbpasswd
|
||||
|
||||
# This is where SWAT images and help files go
|
||||
! SWATDIR = $(BASEDIR)/share/swat
|
||||
|
||||
# the directory where lock files go
|
||||
! LOCKDIR = $(VARDIR)/lock/samba
|
||||
|
||||
# The directory where code page definition files go
|
||||
CODEPAGEDIR = $(LIBDIR)/codepages
|
||||
|
||||
@ -1,43 +1,70 @@
|
||||
--- samba-2.0.0/source/Makefile.in.orig Sat Aug 22 02:48:36 1998
|
||||
+++ samba-2.0.0/source/Makefile.in Fri Aug 21 22:19:32 1998
|
||||
@@ -23,11 +23,11 @@
|
||||
.SUFFIXES:
|
||||
.SUFFIXES: .c .o
|
||||
|
||||
-BASEDIR=$(prefix)/samba
|
||||
+BASEDIR= /usr
|
||||
BINDIR = $(BASEDIR)/bin
|
||||
-SBINDIR = $(BASEDIR)/bin
|
||||
-LIBDIR = $(BASEDIR)/lib
|
||||
-VARDIR = $(BASEDIR)/var
|
||||
+SBINDIR = $(BASEDIR)/sbin
|
||||
+LIBDIR = /etc
|
||||
+VARDIR = /var
|
||||
MANDIR = $(BASEDIR)/man
|
||||
|
||||
# The permissions to give the executables
|
||||
@@ -36,19 +36,19 @@
|
||||
# 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
|
||||
-SMB_PASSWD_FILE = $(BASEDIR)/private/smbpasswd
|
||||
+SMB_PASSWD_FILE = $(LIBDIR)/smbpasswd
|
||||
|
||||
# This is where SWAT images and help files go
|
||||
-SWATDIR = $(BASEDIR)/swat
|
||||
+SWATDIR = $(BASEDIR)/share/swat
|
||||
|
||||
# the directory where lock files go
|
||||
-LOCKDIR = $(VARDIR)/locks
|
||||
+LOCKDIR = $(VARDIR)/lock/samba
|
||||
|
||||
# The directory where code page definition files go
|
||||
CODEPAGEDIR = $(LIBDIR)/codepages
|
||||
--- samba-2.0.0/source/Makefile.in.orig Sat Aug 22 02:48:36 1998
|
||||
+++ samba-2.0.0/source/Makefile.in Fri Aug 21 22:19:32 1998
|
||||
***************
|
||||
*** 22,32 ****
|
||||
builddir=@builddir@
|
||||
SHELL=/bin/sh
|
||||
|
||||
! BASEDIR=$(prefix)/samba
|
||||
BINDIR = $(BASEDIR)/bin
|
||||
! SBINDIR = $(BASEDIR)/bin
|
||||
! LIBDIR = $(BASEDIR)/lib
|
||||
! VARDIR = $(BASEDIR)/var
|
||||
MANDIR = $(BASEDIR)/man
|
||||
|
||||
# The permissions to give the executables
|
||||
--- 22,32 ----
|
||||
builddir=@builddir@
|
||||
SHELL=/bin/sh
|
||||
|
||||
! BASEDIR=/usr
|
||||
BINDIR = $(BASEDIR)/bin
|
||||
! SBINDIR = $(BASEDIR)/sbin
|
||||
! LIBDIR = /etc
|
||||
! VARDIR = /var
|
||||
MANDIR = $(BASEDIR)/man
|
||||
|
||||
# The permissions to give the executables
|
||||
***************
|
||||
*** 35,54 ****
|
||||
# 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
|
||||
CONFIGFILE = $(LIBDIR)/smb.conf
|
||||
LMHOSTSFILE = $(LIBDIR)/lmhosts
|
||||
DRIVERFILE = $(LIBDIR)/printers.def
|
||||
PASSWD_PROGRAM = /bin/passwd
|
||||
! SMB_PASSWD_FILE = $(BASEDIR)/private/smbpasswd
|
||||
SMB_PASSWD_PROGRAM = $(BASEDIR)/bin/smbpasswd
|
||||
|
||||
# This is where SWAT images and help files go
|
||||
! SWATDIR = $(BASEDIR)/swat
|
||||
|
||||
# the directory where lock files go
|
||||
! LOCKDIR = $(VARDIR)/locks
|
||||
|
||||
# The directory where code page definition files go
|
||||
CODEPAGEDIR = $(LIBDIR)/codepages
|
||||
--- 35,54 ----
|
||||
# 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/samba/log.smb
|
||||
! NMBLOGFILE = $(VARDIR)/log/samba/log.nmb
|
||||
CONFIGFILE = $(LIBDIR)/smb.conf
|
||||
LMHOSTSFILE = $(LIBDIR)/lmhosts
|
||||
DRIVERFILE = $(LIBDIR)/printers.def
|
||||
PASSWD_PROGRAM = /bin/passwd
|
||||
! SMB_PASSWD_FILE = $(LIBDIR)/smbpasswd
|
||||
SMB_PASSWD_PROGRAM = $(BASEDIR)/bin/smbpasswd
|
||||
|
||||
# This is where SWAT images and help files go
|
||||
! SWATDIR = $(BASEDIR)/share/swat
|
||||
|
||||
# the directory where lock files go
|
||||
! LOCKDIR = $(VARDIR)/lock/samba
|
||||
|
||||
# The directory where code page definition files go
|
||||
CODEPAGEDIR = $(LIBDIR)/codepages
|
||||
|
||||
Loading…
Reference in New Issue
Block a user