[Olsr-cvs] olsrd-current Makefile,1.98,1.99

Bernd Petrovitsch (spam-protected)
Fri Oct 5 10:39:15 CEST 2007


Update of /cvsroot/olsrd/olsrd-current
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9529

Modified Files:
	Makefile 
Log Message:
as reported by Aaron Kaplan <(spam-protected)>:
* BSD-xargs doesn't know "--no-run-if-empty" aka "-r". So we simply kill it
  (leaving a comment for me to not add it again in 6 months - I have yet to
  encounter a situation where "-r" is actually wrong) as "rm -f" without
  parameters does nothing anyways.
* But it knows "-0" as I learned. So we use that too.

And yes, if I use "find | xargs" it actually is written as
"find -print0 | xargs -0r". Everytime.


Index: Makefile
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/Makefile,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** Makefile	16 Sep 2007 21:50:17 -0000	1.98
--- Makefile	5 Oct 2007 08:39:12 -0000	1.99
***************
*** 93,97 ****
  uberclean:	clean clean_libs
  		-rm -f $(TAGFILE)
! 		find . \( -name '*.[od]' -o -name '*~' \) -print | xargs -r rm -f
  		$(MAKECMD) -C $(CFGDIR) uberclean
  		$(MAKECMD) -C $(SWITCHDIR) clean
--- 93,98 ----
  uberclean:	clean clean_libs
  		-rm -f $(TAGFILE)
! 		# BSD-xargs has no "--no-run-if-empty" aka "-r"
! 		find . \( -name '*.[od]' -o -name '*~' \) -print0 | xargs -0 rm -f
  		$(MAKECMD) -C $(CFGDIR) uberclean
  		$(MAKECMD) -C $(SWITCHDIR) clean





More information about the Olsr-cvs mailing list