summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Terpstra <jht@samba.org>1998-11-18 12:44:29 +0000
committerJohn Terpstra <jht@samba.org>1998-11-18 12:44:29 +0000
commit8b1e3580bd5b3e0846389fc0480bd3c6e0606c36 (patch)
tree1594528e454e0d9d2d654d38e5cf286809b6ef0e
parent15b203519a75e5e8cdca09fe6b1dc2bf377ac75e (diff)
downloadsamba-8b1e3580bd5b3e0846389fc0480bd3c6e0606c36.tar.gz
samba-8b1e3580bd5b3e0846389fc0480bd3c6e0606c36.tar.bz2
samba-8b1e3580bd5b3e0846389fc0480bd3c6e0606c36.zip
Updated packaging files in line with restructuring of Makefile.in
(This used to be commit 05f2d78c8ee1dc0516d9e1076e0954ee2c2cd4b2)
-rw-r--r--packaging/Caldera/makefile-path.patch113
-rw-r--r--packaging/Caldera/samba2.spec.tmpl2
-rw-r--r--packaging/PHT/TurboLinux/makefile-path.patch113
-rw-r--r--packaging/PHT/TurboLinux/samba2.spec.tmpl2
-rw-r--r--packaging/RedHat/makefile-path.patch113
-rw-r--r--packaging/RedHat/samba2.spec.tmpl2
6 files changed, 132 insertions, 213 deletions
diff --git a/packaging/Caldera/makefile-path.patch b/packaging/Caldera/makefile-path.patch
index a6988fcb75..98ab8e1997 100644
--- a/packaging/Caldera/makefile-path.patch
+++ b/packaging/Caldera/makefile-path.patch
@@ -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
diff --git a/packaging/Caldera/samba2.spec.tmpl b/packaging/Caldera/samba2.spec.tmpl
index bda5a56028..7765c570e4 100644
--- a/packaging/Caldera/samba2.spec.tmpl
+++ b/packaging/Caldera/samba2.spec.tmpl
@@ -42,7 +42,7 @@ docs directory for implementation details.
%build
cd source
-./configure
+./configure --prefix=/usr --libdir=/etc
make all
%install
diff --git a/packaging/PHT/TurboLinux/makefile-path.patch b/packaging/PHT/TurboLinux/makefile-path.patch
index a6988fcb75..98ab8e1997 100644
--- a/packaging/PHT/TurboLinux/makefile-path.patch
+++ b/packaging/PHT/TurboLinux/makefile-path.patch
@@ -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
diff --git a/packaging/PHT/TurboLinux/samba2.spec.tmpl b/packaging/PHT/TurboLinux/samba2.spec.tmpl
index 444a0e1df6..0d39999d37 100644
--- a/packaging/PHT/TurboLinux/samba2.spec.tmpl
+++ b/packaging/PHT/TurboLinux/samba2.spec.tmpl
@@ -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
diff --git a/packaging/RedHat/makefile-path.patch b/packaging/RedHat/makefile-path.patch
index a6988fcb75..98ab8e1997 100644
--- a/packaging/RedHat/makefile-path.patch
+++ b/packaging/RedHat/makefile-path.patch
@@ -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
diff --git a/packaging/RedHat/samba2.spec.tmpl b/packaging/RedHat/samba2.spec.tmpl
index b00001443b..43db590578 100644
--- a/packaging/RedHat/samba2.spec.tmpl
+++ b/packaging/RedHat/samba2.spec.tmpl
@@ -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