[Astlinux-commits] SF.net SVN: astlinux:[6052] branches/1.0/package

[<abe...@us...>]

Revision: 6052
          http://sourceforge.net/p/astlinux/code/6052
Author:   abelbeck
Date:     2013-04-22 14:22:49 +0000 (Mon, 22 Apr 2013)
Log Message:
-----------
dnsmasq, minor build tweak from upstream Buildroot

Modified Paths:
--------------
    branches/1.0/package/dnsmasq/dnsmasq.mk
    branches/1.0/package/libcurl/libcurl.mk

Modified: branches/1.0/package/dnsmasq/dnsmasq.mk
===================================================================
--- branches/1.0/package/dnsmasq/dnsmasq.mk	2013-04-20 18:20:05 UTC (rev 6051)
+++ branches/1.0/package/dnsmasq/dnsmasq.mk	2013-04-22 14:22:49 UTC (rev 6052)
@@ -69,7 +69,7 @@
 	$(DNSMASQ_FIX_PKGCONFIG)
 	$(DNSMASQ_ENABLE_DBUS)
 	$(DNSMASQ_ENABLE_IPSET)
-	$(DNSMASQ_MAKE_ENV) $(MAKE) -C $(@D) $(DNSMASQ_MAKE_OPT)
+	$(DNSMASQ_MAKE_ENV) $(MAKE1) -C $(@D) $(DNSMASQ_MAKE_OPT)
 endef
 
 define DNSMASQ_INSTALL_TARGET_CMDS

Modified: branches/1.0/package/libcurl/libcurl.mk
===================================================================
--- branches/1.0/package/libcurl/libcurl.mk	2013-04-20 18:20:05 UTC (rev 6051)
+++ branches/1.0/package/libcurl/libcurl.mk	2013-04-22 14:22:49 UTC (rev 6052)
@@ -17,8 +17,9 @@
 # Fix it by setting LD_LIBRARY_PATH to something sensible so those libs
 # are found first.
 LIBCURL_CONF_ENV += LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/lib:/usr/lib
-LIBCURL_CONF_OPT += --with-ssl=$(STAGING_DIR)/usr --with-random=/dev/urandom
-LIBCURL_CONF_OPT += --with-ca-path=/usr/lib/ssl/certs
+LIBCURL_CONF_OPT += --with-ssl=$(STAGING_DIR)/usr \
+	--with-random=/dev/urandom \
+	--with-ca-path=/usr/lib/ssl/certs
 else
 LIBCURL_CONF_OPT += --without-ssl
 endif

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.