sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

Updated packaging files in line with restructuring of Makefile.in

Browse Source 
(This used to be commit 05f2d78c8ee1dc0516d9e1076e0954ee2c2cd4b2)
This commit is contained in:
John Terpstra 1998-11-18 12:44:29 +00:00
parent 15b203519a
commit 8b1e3580bd
6 changed files with 132 additions and 213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
packaging/Caldera/makefile-path.patch
View File

@ -1,70 +1,43 @@
--- 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
--- samba-2.0.0/source/Makefile.in.orig Wed Nov 18 09:58:38 1998
+++ samba-2.0.0/source/Makefile.in Wed Nov 18 23:32:58 1998
@@ -24,7 +24,7 @@
BINDIR = @bindir@
SBINDIR = @sbindir@
LIBDIR = @libdir@
-VARDIR = $(BASEDIR)/var
+VARDIR = /var
MANDIR = @mandir@
# The permissions to give the executables
@@ -33,23 +33,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
-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 = $(BASEDIR)/bin/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

2
packaging/Caldera/samba2.spec.tmpl
View File

@ -42,7 +42,7 @@ docs directory for implementation details.
%build
cd source
./configure
./configure --prefix=/usr --libdir=/etc
make all
%install

113
packaging/PHT/TurboLinux/makefile-path.patch
View File

@ -1,70 +1,43 @@
--- 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
--- samba-2.0.0/source/Makefile.in.orig Wed Nov 18 09:58:38 1998
+++ samba-2.0.0/source/Makefile.in Wed Nov 18 23:32:58 1998
@@ -24,7 +24,7 @@
BINDIR = @bindir@
SBINDIR = @sbindir@
LIBDIR = @libdir@
-VARDIR = $(BASEDIR)/var
+VARDIR = /var
MANDIR = @mandir@
# The permissions to give the executables
@@ -33,23 +33,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
-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 = $(BASEDIR)/bin/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

2
packaging/PHT/TurboLinux/samba2.spec.tmpl
View File

@ -97,7 +97,7 @@ enabled. Red Hat Linux has built in support for quotas in PAM.
%build
cd source
./configure --with-smbwrapper
./configure --prefix=/usr --libdir=/etc --with-smbwrapper
make all smbwrapper
%install

113
packaging/RedHat/makefile-path.patch
View File

@ -1,70 +1,43 @@
--- 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
--- samba-2.0.0/source/Makefile.in.orig Wed Nov 18 09:58:38 1998
+++ samba-2.0.0/source/Makefile.in Wed Nov 18 23:32:58 1998
@@ -24,7 +24,7 @@
BINDIR = @bindir@
SBINDIR = @sbindir@
LIBDIR = @libdir@
-VARDIR = $(BASEDIR)/var
+VARDIR = /var
MANDIR = @mandir@
# The permissions to give the executables
@@ -33,23 +33,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
-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 = $(BASEDIR)/bin/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

2
packaging/RedHat/samba2.spec.tmpl
View File

@ -97,7 +97,7 @@ enabled. Red Hat Linux has built in support for quotas in PAM.
%build
cd source
./configure --with-smbwrapper
./configure --prefix=/usr --libdir=/etc --with-smbwrapper
make all smbwrapper
%install