[Glibc-bsd-commits] r5287 - trunk/freebsd-glue/debian

[rmh at alioth.debian.org]

Author: rmh
Date: 2014-01-02 17:22:43 +0000 (Thu, 02 Jan 2014)
New Revision: 5287

Modified:
   trunk/freebsd-glue/debian/changelog
   trunk/freebsd-glue/debian/rules
Log:
Attempt to use fmake, then fallback to make (in /usr/lib/freebsd). This garantees FreeBSD make no matter which freebsd-buildutils we're using.

Modified: trunk/freebsd-glue/debian/changelog
===================================================================
--- trunk/freebsd-glue/debian/changelog	2014-01-02 17:01:15 UTC (rev 5286)
+++ trunk/freebsd-glue/debian/changelog	2014-01-02 17:22:43 UTC (rev 5287)
@@ -1,3 +1,11 @@
+freebsd-glue (0.2.10) unstable; urgency=low
+
+  * Attempt to use fmake, then fallback to make (in /usr/lib/freebsd).
+    This garantees FreeBSD make no matter which freebsd-buildutils we're
+    using.
+
+ -- Robert Millan <rmh at debian.org>  Thu, 02 Jan 2014 18:17:49 +0100
+
 freebsd-glue (0.2.9) unstable; urgency=low
 
   * sysarch.c: Avoid conflicting declarations in <machine/sysarch.h>.

Modified: trunk/freebsd-glue/debian/rules
===================================================================
--- trunk/freebsd-glue/debian/rules	2014-01-02 17:01:15 UTC (rev 5286)
+++ trunk/freebsd-glue/debian/rules	2014-01-02 17:22:43 UTC (rev 5287)
@@ -17,13 +17,16 @@
 	MAKEOBJDIRPREFIX=$(CURDIR)/obj-deb \
 	CFLAGS="$(CFLAGS) -O2" \
 	DESTDIR="$(DESTDIR)" \
-	make
+	$(shell which fmake || which make) \
+	$(NULL)
 PMAKE_UDEB := \
 	MAKEFLAGS=$(BSD_MAKEFLAGS) \
 	MAKEOBJDIRPREFIX=$(CURDIR)/obj-udeb \
 	CFLAGS="$(CFLAGS) -Os" \
 	DESTDIR="$(DESTDIR)-udeb" \
-	make RESCUE=yes
+	$(shell which fmake || which make) \
+	RESCUE=yes \
+	$(NULL)
 
 DEB_HOST_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_HOST_ARCH_OS	?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)