[Nagiosplug-checkins] CVS: nagiosplug Makefile.am,1.20,1.21

[Karl DeBisschop]

Update of /cvsroot/nagiosplug/nagiosplug
In directory sc8-pr-cvs1:/tmp/cvs-serv28258

Modified Files:
	Makefile.am 
Log Message:
change so make-dist works in subdirs

Index: Makefile.am
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/Makefile.am,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** Makefile.am	1 Sep 2003 20:07:17 -0000	1.20
--- Makefile.am	4 Sep 2003 06:43:38 -0000	1.21
***************
*** 5,9 ****
  EXTRA_DIST = config.rpath \
  	ABOUT-NLS CODING FAQ LEGAL REQUIREMENTS SUPPORT THANKS \
! 	Helper.pm contrib pkg nagios-plugins.spec.in
  
  ACLOCAL_AMFLAGS = -I lib
--- 5,9 ----
  EXTRA_DIST = config.rpath \
  	ABOUT-NLS CODING FAQ LEGAL REQUIREMENTS SUPPORT THANKS \
! 	Helper.pm contrib pkg nagios-plugins.spec
  
  ACLOCAL_AMFLAGS = -I lib
***************
*** 13,17 ****
  
  dist-hook:
! 	sed "s/%%{VERSION}/${VERSION}/;s/%%{RELEASE}/${RELEASE}/;" $(srcdir)/nagios-plugins.spec.in > $(distdir)/nagios-plugins.spec
  
  test:
--- 13,17 ----
  
  dist-hook:
! 	make THANKS nagios-plugins.spec
  
  test:
***************
*** 35,40 ****
  	cd $(BUILDDIR) && $(PERL) ../$(PKGSCRIPT) ../$(PACKDIR)
  
! THANKS: THANKS.in AUTHORS
! 	perl -e ' while (<>) { print STDERR "Duplicate: $$_",$$/ if ($$a{$$_}) ; $$a{$$_}++}; print sort by_last_field (keys %a); sub by_last_field { ($$a1) = $$a =~ /\s(\w+)$$/; ($$b1) = $$b =~ /\s(\w+)$$/; $$a1 cmp $$b1}' AUTHORS | cat THANKS.in - > $@
  
  pkgclean:
--- 35,44 ----
  	cd $(BUILDDIR) && $(PERL) ../$(PKGSCRIPT) ../$(PACKDIR)
  
! THANKS: AUTHORS
! 	@echo "This software is brought to you by the Nagios Plugins Development Team. However," > $@
! 	@echo "there have been many contributors to this project. Everyone below has helped in " >> $@
! 	@echo "raising bug reports, creating patches or contributing new plugins." >> $@
! 	@echo "" >> $@
! 	perl -e ' while (<>) { print STDERR "Duplicate: $$_",$$/ if ($$a{$$_}) ; $$a{$$_}++}; print sort by_last_field (keys %a); sub by_last_field { ($$a1) = $$a =~ /\s(\w+)$$/; ($$b1) = $$b =~ /\s(\w+)$$/; $$a1 cmp $$b1}' $? >> $@
  
  pkgclean: