[Glibc-bsd-commits] r4290 - trunk/libbsd/debian

[Guillem Jover]

Author: guillem
Date: 2012-05-29 05:37:12 +0000 (Tue, 29 May 2012)
New Revision: 4290

Modified:
   trunk/libbsd/debian/rules
Log:
Update rules for autoconfiscated upstream


Modified: trunk/libbsd/debian/rules
===================================================================
--- trunk/libbsd/debian/rules	2012-05-28 09:12:21 UTC (rev 4289)
+++ trunk/libbsd/debian/rules	2012-05-29 05:37:12 UTC (rev 4290)
@@ -15,32 +15,49 @@
 libudeb := $(lib)-udeb
 libdev := libbsd-dev
 
+config.status: configure
+	dh_testdir
+
+	./configure \
+		CPPFLAGS="$(CPPFLAGS)" \
+		CFLAGS="$(CFLAGS)" \
+		LDFLAGS="$(LDFLAGS)" \
+		--prefix=/usr \
+		--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+
 build-indep:
 
-build-arch:
+build-arch: config.status
 	dh_testdir
 
-	$(MAKE) CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+	$(MAKE)
 
 build: build-indep build-arch
 
+# Run the test suites
+check-arch: build-arch
+	dh_testdir
+
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	$(MAKE) check
+endif
+
 clean:
 	dh_testdir
 	dh_testroot
 
-	$(MAKE) clean
+	[ ! -f Makefile ] || $(MAKE) clean
 
 	dh_clean
 
-install-arch: build-arch
+install-arch: check-arch
 	dh_testdir
 	dh_testroot
 	dh_prep
 	dh_installdirs
 
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp \
-		libdir=/lib/$(DEB_HOST_MULTIARCH) \
-		usrlibdir=/usr/lib/$(DEB_HOST_MULTIARCH)
+	                runtimelibdir=/lib/$(DEB_HOST_MULTIARCH)
 
 binary-indep:
 # Nothing to do.