Re: glib/po/Makefile.in.in and po2tbl.sed.in

[Owen Taylor <otaylor redhat com>]

jacob berkman <jacob ximian com> writes:

> On Mon, 2002-01-21 at 20:16, jacob berkman wrote:
> > i had this patch in my local tree, iirc po2tbl.sed.in isn't needed any
> > more and we should remove it.
> 
> that was the wrong version of the patch.

This looks fine to commit.

Regards,
                                        Owen

> Index: Makefile.in.in
> ===================================================================
> RCS file: /cvs/gnome/glib/po/Makefile.in.in,v
> retrieving revision 1.6
> diff -u -r1.6 Makefile.in.in
> --- Makefile.in.in	2001/10/28 16:34:24	1.6
> +++ Makefile.in.in	2002/01/22 01:24:28
> @@ -97,21 +97,6 @@
>  	   || ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \
>  		&& mv $(GETTEXT_PACKAGE).po $(srcdir)/$(GETTEXT_PACKAGE).pot )
>  
> -$(srcdir)/cat-id-tbl.c: stamp-cat-id; @:
> -$(srcdir)/stamp-cat-id: $(GETTEXT_PACKAGE).pot
> -	rm -f cat-id-tbl.tmp
> -	sed -f ./po2tbl.sed $(srcdir)/$(GETTEXT_PACKAGE).pot \
> -		| sed -e "s/@GETTEXT_PACKAGE NAME@/$(GETTEXT_PACKAGE)/" > cat-id-tbl.tmp
> -	if cmp -s cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; then \
> -	  rm cat-id-tbl.tmp; \
> -	else \
> -	  echo cat-id-tbl.c changed; \
> -	  rm -f $(srcdir)/cat-id-tbl.c; \
> -	  mv cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; \
> -	fi
> -	cd $(srcdir) && rm -f stamp-cat-id && echo timestamp > stamp-cat-id
> -
> -
>  install: install-exec install-data
>  install-exec:
>  install-data: install-data- USE_NLS@
> @@ -166,8 +151,6 @@
>  	  fi; \
>  	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
>  			  $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
> -	  $(INSTALL_DATA) $(srcdir)/po2tbl.sed.in \
> -			  $(DESTDIR)$(gettextsrcdir)/po2tbl.sed.in; \
>  	else \
>  	  : ; \
>  	fi
> @@ -200,7 +183,7 @@
>  clean: mostlyclean
>  
>  distclean: clean
> -	rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m po2tbl.sed
> +	rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m
>  
>  maintainer-clean: distclean
>  	@echo "This command is intended for maintainers to use;"