X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=libs%2Fopenldap%2FMakefile;h=1e8e215cea08b499d1e3762ac6e86ba973a75347;hp=4068800304efa7ea1fa792225eb442ffdbd0b343;hb=94b0bf189986ce560199572b0261473f1244517e;hpb=65fe97663c370d12d626fb4c562387e38402e0ab

diff --git a/libs/openldap/Makefile b/libs/openldap/Makefile
index 4068800304..1e8e215cea 100644
--- a/libs/openldap/Makefile
+++ b/libs/openldap/Makefile
@@ -59,7 +59,7 @@ define Package/openldap-utils
     This package contains client programs required to access LDAP servers.
 endef
 
-PKG_CONFIGURE_OPTIONS = \
+CONFIGURE_ARGS += \
 	--enable-shared \
 	--enable-static \
 	--disable-debug \
@@ -73,76 +73,16 @@ PKG_CONFIGURE_OPTIONS = \
 	--with-threads \
 	--with-tls \
 	--with-yielding_select="yes" \
+	--without-cyrus-sasl \
+	--without-threads \
+	--without-tls 
 
-define Build/Configure
-endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
-	-$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		distclean
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
-		./configure \
-			--target=$(GNU_HOST_NAME) \
-			--host=$(GNU_HOST_NAME) \
-			--build=$(GNU_HOST_NAME) \
-			--program-prefix="" \
-			--program-suffix="" \
-			--prefix=/usr \
-			--exec-prefix=/usr \
-			--bindir=/usr/bin \
-			--datadir=/usr/share \
-			--includedir=/usr/include \
-			--libdir=/usr/lib \
-			--libexecdir=/usr/lib \
-			--localstatedir=/var \
-			--mandir=/usr/share/man \
-			--sbindir=/usr/sbin \
-			--sysconfdir=/etc \
-			$(DISABLE_LARGEFILE) \
-			$(DISABLE_NLS) \
-			$(PKG_CONFIGURE_OPTIONS) \
-			--without-cyrus-sasl \
-			--without-threads \
-			--without-tls \
-	);
-	$(MAKE) -C $(PKG_BUILD_DIR) depend 
-	$(MAKE) -C $(PKG_BUILD_DIR)/libraries/liblutil
-	$(MAKE) -C $(PKG_BUILD_DIR)/libraries/liblber
-	$(MAKE) -C $(PKG_BUILD_DIR)/libraries/liblunicode
-	$(MAKE) -C $(PKG_BUILD_DIR)/libraries/liblber clean
-	$(MAKE) -C $(PKG_BUILD_DIR)/libraries/liblutil clean
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib " \
-		./configure \
-			--target=$(GNU_TARGET_NAME) \
-			--host=$(GNU_TARGET_NAME) \
-			--build=$(GNU_HOST_NAME) \
-			--program-prefix="" \
-			--program-suffix="" \
-			--prefix=/usr \
-			--exec-prefix=/usr \
-			--bindir=/usr/bin \
-			--datadir=/usr/share \
-			--includedir=/usr/include \
-			--libdir=/usr/lib \
-			--libexecdir=/usr/lib \
-			--localstatedir=/var \
-			--mandir=/usr/share/man \
-			--sbindir=/usr/sbin \
-			--sysconfdir=/etc \
-			$(DISABLE_LARGEFILE) \
-			$(DISABLE_NLS) \
-			$(PKG_CONFIGURE_OPTIONS) \
-	);
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
+		HOSTCC="$(HOSTCC)" \
+		depend all install
 endef
 
 define Build/InstallDev