[Pkg-samba-maint] r1041 - branches/samba4

[Jelmer Vernooij]

Author: ctrlsoft-guest
Date: 2006-03-23 01:19:18 +0000 (Thu, 23 Mar 2006)
New Revision: 1041

Modified:
   branches/samba4/changelog
   branches/samba4/libldb-dev.install
   branches/samba4/rules
Log:
+  * Pass fewer options for paths to configure
+  * Adapt to new paths from upstream


Modified: branches/samba4/changelog
===================================================================
--- branches/samba4/changelog	2006-03-23 00:15:53 UTC (rev 1040)
+++ branches/samba4/changelog	2006-03-23 01:19:18 UTC (rev 1041)
@@ -7,8 +7,10 @@
   * Include oLschema2ldif.1 in the ldb-tools package.
   * Enable shared library building.
   * Put ldb, tdb and talloc libraries into seperate binary packages.
+  * Pass fewer options for paths to configure
+  * Adapt to new paths from upstream
 
- -- Jelmer Vernooij <jelmer at rhonwyn.lan.vernstok.nl>  Thu, 23 Mar 2006 01:13:32 +0100
+ -- Jelmer Vernooij <jelmer at samba.org>  Thu, 23 Mar 2006 01:13:32 +0100
 
 samba (3.9.1+4.0.0tp1-1) experimental; urgency=low
 

Modified: branches/samba4/libldb-dev.install
===================================================================
--- branches/samba4/libldb-dev.install	2006-03-23 00:15:53 UTC (rev 1040)
+++ branches/samba4/libldb-dev.install	2006-03-23 01:19:18 UTC (rev 1041)
@@ -1,4 +1,3 @@
 usr/include/samba-4.0/ldb.h
-usr/include/samba-4.0/ldb_errors.h
 usr/lib/pkgconfig/ldb.pc
 usr/lib/libldb.so

Modified: branches/samba4/rules
===================================================================
--- branches/samba4/rules	2006-03-23 00:15:53 UTC (rev 1040)
+++ branches/samba4/rules	2006-03-23 01:19:18 UTC (rev 1041)
@@ -9,14 +9,6 @@
 	cd $(SOURCEPATH) && ./configure --with-fhs \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
-		--enable-shared \
-		--enable-static \
-		--sysconfdir=/etc \
-		--libdir=/etc/samba \
-		--with-configdir=/etc/samba \
-		--with-privatedir=/etc/samba \
-		--with-piddir=/var/run/samba \
-		--localstatedir=/var \
 		--with-pam \
 		--with-syslog \
 		--with-readline \