[Glibc-bsd-commits] r1363 - trunk/freebsd-utils/debian

Robert Millan rmh at costa.debian.org
Sun Mar 19 11:12:38 UTC 2006


Author: rmh
Date: 2006-03-19 11:12:38 +0000 (Sun, 19 Mar 2006)
New Revision: 1363

Modified:
   trunk/freebsd-utils/debian/rules
Log:
Get sed hacks to happen _before_ appliing patches.

Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules	2006-03-19 11:12:07 UTC (rev 1362)
+++ trunk/freebsd-utils/debian/rules	2006-03-19 11:12:38 UTC (rev 1363)
@@ -25,15 +25,19 @@
   $(NULL)
 
 build/$(package):: apply-patches
+	set -e ; for i in $(dirs) ; do \
+		$(PMAKE) -C $(DEB_SRCDIR)/$$i ; \
+	done
+
+include /usr/share/cdbs/1/rules/tarball.mk
+pre-build:: $(_cdbs_tarball_stamps)
 	find $(DEB_SRCDIR) -type f | (set -e ; while read i ; do sed -i $$i \
 		-e "/^__FBSDID/d" -e "s,<sys/queue.h>,<bsd/queue.h>,g" -e "s/^LDADD=/LDADD+=/g" \
 		-e "/[ \t]*__dead2[ \t]*/d" \
 		-e "s/getline/bsd_&/g" \
 	; done)
-	set -e ; for i in $(dirs) ; do \
-		$(PMAKE) -C $(DEB_SRCDIR)/$$i ; \
-	done
 
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/tarball.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk




More information about the Glibc-bsd-commits mailing list