[Glibc-bsd-commits] r3348 - trunk/freebsd-buildutils/debian

[Guillem Jover]

Author: guillem
Date: 2011-05-29 19:24:57 +0000 (Sun, 29 May 2011)
New Revision: 3348

Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/rules
Log:
Install binaries directly to /usr/lib/freebsd

Instead of relocating them from /usr/bin and /usr/sbin.



Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2011-05-29 19:18:56 UTC (rev 3347)
+++ trunk/freebsd-buildutils/debian/changelog	2011-05-29 19:24:57 UTC (rev 3348)
@@ -23,6 +23,8 @@
     - Add builtin MACHINE_MULTIARCH make variable.
   * Refactor source and tar name into SOURCE and TARNAME in debian/rules.
   * Line-wrap CFLAGS variable in debian/rules.
+  * Install binaries directly to /usr/lib/freebsd instead of relocating them
+    from /usr/bin and /usr/sbin.
 
  -- Robert Millan <rmh at debian.org>  Thu, 13 Jan 2011 18:29:12 +0100
 

Modified: trunk/freebsd-buildutils/debian/rules
===================================================================
--- trunk/freebsd-buildutils/debian/rules	2011-05-29 19:18:56 UTC (rev 3347)
+++ trunk/freebsd-buildutils/debian/rules	2011-05-29 19:24:57 UTC (rev 3348)
@@ -123,11 +123,11 @@
 
 	for i in cksum lex make mkdep yacc file2c brandelf ; do \
 	  $(PMAKE) -C $(CURDIR)/build-tree/src/usr.bin/$$i install \
-		DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/bin ; \
+		DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/lib/freebsd ; \
 	done
 	for i in mtree config ; do \
 	  $(PMAKE) -C $(CURDIR)/build-tree/src/usr.sbin/$$i install \
-		DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/sbin ; \
+		DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/lib/freebsd ; \
 	done
 	$(PMAKE) -C build-tree/src/share/mk install \
 		DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/share
@@ -141,10 +141,6 @@
 		$(CURDIR)/debian/$(package)/var
 
 	# relocate binaries
-	mv \
-		$(CURDIR)/debian/$(package)/usr/bin/* \
-		$(CURDIR)/debian/$(package)/usr/sbin/* \
-		$(CURDIR)/debian/$(package)/usr/lib/freebsd/
 	for i in `cd $(CURDIR)/debian/$(package)/usr/lib/freebsd && ls` ; do \
 		ln -s ../lib/freebsd/$$i \
 		$(CURDIR)/debian/$(package)/usr/bin/freebsd-$$i ; \