[Glibc-bsd-commits] r4800 - trunk/freebsd-libs/debian

[Guillem Jover]

Author: guillem
Date: 2013-07-25 14:27:31 +0000 (Thu, 25 Jul 2013)
New Revision: 4800

Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/rules
Log:
Add build-indep and build-arch debian/rules targets

- Rename BUILD_TARGETS to BUILD_ARCH_TARGETS.
- Rename build to build-arch and install to install-arch targets.
- Add empty build-indep target.
- Add build target depending on build-indep and build-arch.
- Split install into install-indep and install-arch targets.
- Switch binary-indep and binary-arch to depend on install-indep and
  install-arch targets respectively.


Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2013-07-25 10:56:37 UTC (rev 4799)
+++ trunk/freebsd-libs/debian/changelog	2013-07-25 14:27:31 UTC (rev 4800)
@@ -6,6 +6,14 @@
 
   [ Guillem Jover ]
   * Switch to canonical Vcs URLs.
+  * Add build-indep and build-arch debian/rules targets:
+    - Rename BUILD_TARGETS to BUILD_ARCH_TARGETS.
+    - Rename build to build-arch and install to install-arch targets.
+    - Add empty build-indep target.
+    - Add build target depending on build-indep and build-arch.
+    - Split install into install-indep and install-arch targets.
+    - Switch binary-indep and binary-arch to depend on install-indep and
+      install-arch targets respectively.
 
  -- Robert Millan <rmh at debian.org>  Tue, 16 Jul 2013 15:24:27 +0200
 

Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2013-07-25 10:56:37 UTC (rev 4799)
+++ trunk/freebsd-libs/debian/rules	2013-07-25 14:27:31 UTC (rev 4800)
@@ -71,10 +71,10 @@
 	tar --numeric-owner --owner 0 --group 0 -czf ../$(TARNAME) $(ORIGDIR)
 	rm -rf $(ORIGDIR)
 
-BUILD_TARGETS = build-sbuf # build-dwarf build-elf
+BUILD_ARCH_TARGETS = build-sbuf # build-dwarf build-elf
 
 ifeq ($(kernel), kfreebsd)
-BUILD_TARGETS += \
+BUILD_ARCH_TARGETS += \
 	build-cam \
 	build-geom \
 	build-ipx \
@@ -89,7 +89,9 @@
 	build-alias
 endif
 
-build: $(BUILD_TARGETS)
+build: build-indep build-arch
+build-indep:
+build-arch: $(BUILD_ARCH_TARGETS)
 
 build-cam: build-cam-stamp
 build-cam-stamp: build-sbuf
@@ -189,12 +191,20 @@
 	rm -f *stamp
 	dh_clean
 
-install: build
+install-indep: build-indep
 	dh_testdir
 	dh_testroot
-	dh_prep
-	dh_installdirs
+	dh_prep -i
+	dh_installdirs -i
 
+	dh_install -i --list-missing
+
+install-arch: build-arch
+	dh_testdir
+	dh_testroot
+	dh_prep -a
+	dh_installdirs -a
+
 	mkdir -p $(DESTDIR)/lib $(DESTDIR)/usr/lib $(DESTDIR)/usr/include $(DESTDIR)/usr/share/man/man3
 	$(PMAKE) -C $(CURDIR)/lib/libsbuf install SHLIBDIR=/lib
 #	$(PMAKE) -C $(CURDIR)/lib/libdwarf install SHLIBDIR=/usr/lib
@@ -219,10 +229,10 @@
 	install -m755 debian/libusb-config $(CURDIR)/debian/tmp/usr/bin
 endif
 
-	dh_install --list-missing
+	dh_install -a --list-missing
 
 # Build architecture-independent files here.
-binary-indep: build install
+binary-indep: install-indep
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs -i
@@ -236,7 +246,7 @@
 	dh_builddeb -i
 
 # Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: install-arch
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs -a