2012-10-26 16:27:11 +02:00
|
|
|
From 39e5cc1cbae0f7c64ba242357a5d50f23a8475ba Mon Sep 17 00:00:00 2001
|
2010-08-27 21:45:34 +02:00
|
|
|
From: Ralf Haferkamp <rhafer@suse.de>
|
|
|
|
|
Date: Wed, 16 Jun 2010 14:04:07 +0200
|
2011-02-16 14:51:13 +01:00
|
|
|
Subject: build-adjustments
|
2010-08-27 21:45:34 +02:00
|
|
|
|
|
|
|
|
- Adjusted modules path
|
|
|
|
|
- don't use automake macro
|
|
|
|
|
|
|
|
|
|
diff --git a/build/top.mk b/build/top.mk
|
2012-02-28 08:37:37 +01:00
|
|
|
index 14e291e..633c9a4 100644
|
2010-08-27 21:45:34 +02:00
|
|
|
--- a/build/top.mk
|
|
|
|
|
+++ b/build/top.mk
|
|
|
|
|
@@ -40,7 +40,7 @@ libdir = @libdir@
|
2006-12-19 00:17:14 +01:00
|
|
|
libexecdir = @libexecdir@
|
|
|
|
|
localstatedir = @localstatedir@
|
|
|
|
|
mandir = @mandir@
|
|
|
|
|
-moduledir = @libexecdir@$(ldap_subdir)
|
|
|
|
|
+moduledir = @libexecdir@/modules
|
|
|
|
|
sbindir = @sbindir@
|
|
|
|
|
sharedstatedir = @sharedstatedir@
|
|
|
|
|
sysconfdir = @sysconfdir@$(ldap_subdir)
|
2010-08-27 21:45:34 +02:00
|
|
|
diff --git a/configure.in b/configure.in
|
2012-10-26 16:27:11 +02:00
|
|
|
index 792cf0c..6c357ee 100644
|
2010-08-27 21:45:34 +02:00
|
|
|
--- a/configure.in
|
|
|
|
|
+++ b/configure.in
|
2011-07-28 14:07:12 +02:00
|
|
|
@@ -69,7 +69,9 @@ dnl Determine host platform
|
2006-12-19 00:17:14 +01:00
|
|
|
dnl we try not to use this for much
|
|
|
|
|
AC_CANONICAL_TARGET([])
|
|
|
|
|
|
|
|
|
|
-AM_INIT_AUTOMAKE([$OL_PACKAGE],[$OL_VERSION], [no defines])dnl
|
|
|
|
|
+AC_PROG_MAKE_SET
|
|
|
|
|
+PACKAGE=$OL_PACKAGE
|
|
|
|
|
+VERSION=$OL_VERSION
|
|
|
|
|
AC_SUBST(PACKAGE)dnl
|
|
|
|
|
AC_SUBST(VERSION)dnl
|
|
|
|
|
AC_DEFINE_UNQUOTED(OPENLDAP_PACKAGE,"$PACKAGE",Package)
|
2010-08-27 21:45:34 +02:00
|
|
|
--
|
2012-10-26 16:27:11 +02:00
|
|
|
1.7.10.4
|
2010-05-10 15:38:03 +02:00
|
|
|
|
