On Sun, Jan 10, 2010 at 01:16:13AM -0500, Tom Lane wrote:
> Tim Bunce <tim.bu...@pobox.com> writes:
> > On Sat, Jan 09, 2010 at 11:16:18PM +0200, Peter Eisentraut wrote:
> >> What's the reason for the temp file here?
> 
> > Defensive. If the text2macro.pl program fails/dies then you'd be left
> > with a broken output file with a newer timestamp, so the next make
> > wouldn't rerun text2macro.pl.
> 
> Doesn't make forcibly remove the target file if the command fails?
> 
> [ rummages in manual... ]  It does if you specify .DELETE_ON_ERROR,
> which we do (in Makefile.global); so this bit of complication is
> a waste.

Okay.

Andrew, perhaps you could apply the attached to fix that.  (Or I could
bundle it into one of the split out plperl feature patches.)

Tim.

diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile
index 43b0fd0..3733da7 100644
*** a/src/pl/plperl/GNUmakefile
--- b/src/pl/plperl/GNUmakefile
*************** include $(top_srcdir)/src/Makefile.shlib
*** 57,64 ****
  plperl.o: perlchunks.h
  
  perlchunks.h: $(PERLCHUNKS)
! 	$(PERL) $(srcdir)/text2macro.pl --strip='^(\#.*|\s*)$$' $^ > perlchunks.htmp
! 	mv perlchunks.htmp perlchunks.h
  
  all: all-lib
  
--- 57,63 ----
  plperl.o: perlchunks.h
  
  perlchunks.h: $(PERLCHUNKS)
! 	$(PERL) $(srcdir)/text2macro.pl --strip='^(\#.*|\s*)$$' $^ > perlchunks.h
  
  all: all-lib
  
*************** submake:
*** 79,85 ****
  	$(MAKE) -C $(top_builddir)/src/test/regress pg_regress$(X)
  
  clean distclean maintainer-clean: clean-lib
! 	rm -f SPI.c $(OBJS) perlchunks.htmp perlchunks.h
  	rm -rf results
  	rm -f regression.diffs regression.out
  
--- 78,84 ----
  	$(MAKE) -C $(top_builddir)/src/test/regress pg_regress$(X)
  
  clean distclean maintainer-clean: clean-lib
! 	rm -f SPI.c $(OBJS) perlchunks.h
  	rm -rf results
  	rm -f regression.diffs regression.out
  
-- 
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers

Reply via email to