[Lib-cvs] LIB/po Makefile.in.in,1.1.1.1,1.2

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/lib/LIB/po
In directory usw-pr-cvs1:/tmp/cvs-serv8221/po

Modified Files:
	Makefile.in.in 
Log Message:
	* wymieniony po/Makefile.in.in na nowszy
	* usuniêty niepotrzeby zrob_locale

Index: Makefile.in.in
===================================================================
RCS file: /cvsroot/lib/LIB/po/Makefile.in.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile.in.in	10 May 2000 11:31:58 -0000	1.1.1.1
--- Makefile.in.in	11 Jul 2002 07:28:54 -0000	1.2
***************
*** 1,7 ****
  # Makefile for program source directory in GNU NLS utilities package.
! # Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <dr...@gn...>
  #
  # This file file be copied and used freely without restrictions.  It can
! # be used in projects which are not available under the GNU Public License
  # but which still want to provide support for the GNU gettext functionality.
  # Please note that the actual code is *not* freely available.
--- 1,7 ----
  # Makefile for program source directory in GNU NLS utilities package.
! # Copyright (C) 1995-1997, 2000, 2001 by Ulrich Drepper <dr...@gn...>
  #
  # This file file be copied and used freely without restrictions.  It can
! # be used in projects which are not available under the GNU General Public License
  # but which still want to provide support for the GNU gettext functionality.
  # Please note that the actual code is *not* freely available.
***************
*** 10,13 ****
--- 10,17 ----
  VERSION = @VERSION@

+ # These two variables depend on the location of this directory.
+ subdir = po
+ top_builddir = ..
+ 
  SHELL = /bin/sh
  @SET_MAKE@
***************
*** 19,38 ****
  prefix = @prefix@
  exec_prefix = @exec_prefix@
! datadir = $(prefix)/@DATADIRNAME@
  localedir = $(datadir)/locale
! gnulocaledir = $(prefix)/share/locale
! gettextsrcdir = $(prefix)/share/gettext/po
! subdir = po

  INSTALL = @INSTALL@
  INSTALL_DATA = @INSTALL_DATA@
! MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@

  CC = @CC@
! GENCAT = @GENCAT@
! GMSGFMT = PATH=../src:$$PATH @GMSGFMT@
  MSGFMT = @MSGFMT@
! XGETTEXT = PATH=../src:$$PATH @XGETTEXT@
! MSGMERGE = PATH=../src:$$PATH msgmerge

  DEFS = @DEFS@
--- 23,40 ----
  prefix = @prefix@
  exec_prefix = @exec_prefix@
! datadir = @datadir@
  localedir = $(datadir)/locale
! gettextsrcdir = $(datadir)/gettext/po

  INSTALL = @INSTALL@
  INSTALL_DATA = @INSTALL_DATA@
! MKINSTALLDIRS = @MKINSTALLDIRS@
! mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`

  CC = @CC@
! GMSGFMT = @GMSGFMT@
  MSGFMT = @MSGFMT@
! XGETTEXT = @XGETTEXT@
! MSGMERGE = msgmerge

  DEFS = @DEFS@
***************
*** 44,61 ****
  COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)

- SOURCES = cat-id-tbl.c
  POFILES = @POFILES@
  GMOFILES = @GMOFILES@
  DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \
! stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES)

  POTFILES = \

  CATALOGS = @CATALOGS@
- CATOBJEXT = @CATOBJEXT@
- INSTOBJEXT = @INSTOBJEXT@

  .SUFFIXES:
! .SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat

  .c.o:
--- 46,60 ----
  COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)

  POFILES = @POFILES@
  GMOFILES = @GMOFILES@
  DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \
! $(POFILES) $(GMOFILES)

  POTFILES = \

  CATALOGS = @CATALOGS@

  .SUFFIXES:
! .SUFFIXES: .c .o .po .pox .gmo .mo

  .c.o:
***************
*** 71,87 ****
  .po.gmo:
  	file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
! 	  && rm -f $$file && $(GMSGFMT) -o $$file $<
! 
! .po.cat:
! 	sed -f ../intl/po2msg.sed < $< > $*.msg \
! 	  && rm -f $@ && $(GENCAT) $@ $*.msg

  all: all-@USE_NLS@

! all-yes: cat-id-tbl.c $(CATALOGS)
  all-no:

! $(srcdir)/$(PACKAGE).pot: $(POTFILES)
  	$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
  	  --add-comments --keyword=_ --keyword=N_ \
--- 70,90 ----
  .po.gmo:
  	file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
! 	  && rm -f $$file && $(GMSGFMT) --statistics -o $$file $<

  all: all-@USE_NLS@

! all-yes: $(CATALOGS)
  all-no:

! .PHONY: ../keymap_alldefs.h
! ../keymap_alldefs.h:
! 	cd .. && $(MAKE) keymap_alldefs.h
! 
! # Note: Target 'all' must not depend on target '$(srcdir)/$(PACKAGE).pot',
! # otherwise packages like GCC can not be built if only parts of the source
! # have been downloaded.
! 
! $(srcdir)/$(PACKAGE).pot: $(POTFILES) $(srcdir)/POTFILES.in
  	$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
  	  --add-comments --keyword=_ --keyword=N_ \
***************
*** 91,166 ****
  		&& mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot )

- $(srcdir)/cat-id-tbl.c: stamp-cat-id; @:
- $(srcdir)/stamp-cat-id: $(PACKAGE).pot
- 	rm -f cat-id-tbl.tmp
- 	sed -f ../intl/po2tbl.sed $(srcdir)/$(PACKAGE).pot \
- 		| sed -e "s/@PACKAGE NAME@/$(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@
! install-data-no: all
! install-data-yes: all
! 	if test -r "$(MKINSTALLDIRS)"; then \
! 	  $(MKINSTALLDIRS) $(datadir); \
  	else \
! 	  $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
  	fi
  	@catalogs='$(CATALOGS)'; \
  	for cat in $$catalogs; do \
  	  cat=`basename $$cat`; \
! 	  case "$$cat" in \
! 	    *.gmo) destdir=$(gnulocaledir);; \
! 	    *)     destdir=$(localedir);; \
! 	  esac; \
! 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
! 	  dir=$$destdir/$$lang/LC_MESSAGES; \
! 	  if test -r "$(MKINSTALLDIRS)"; then \
! 	    $(MKINSTALLDIRS) $$dir; \
! 	  else \
! 	    $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
! 	  fi; \
  	  if test -r $$cat; then \
! 	    $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
! 	    echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \
  	  else \
! 	    $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
  	    echo "installing $(srcdir)/$$cat as" \
! 		 "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
! 	  fi; \
! 	  if test -r $$cat.m; then \
! 	    $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
! 	    echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
! 	  else \
! 	    if test -r $(srcdir)/$$cat.m ; then \
! 	      $(INSTALL_DATA) $(srcdir)/$$cat.m \
! 		$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
! 	      echo "installing $(srcdir)/$$cat as" \
! 		   "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
! 	    else \
! 	      true; \
! 	    fi; \
  	  fi; \
  	done
- 	if test "$(PACKAGE)" = "gettext"; then \
- 	  if test -r "$(MKINSTALLDIRS)"; then \
- 	    $(MKINSTALLDIRS) $(gettextsrcdir); \
- 	  else \
- 	    $(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
- 	  fi; \
- 	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
- 			  $(gettextsrcdir)/Makefile.in.in; \
- 	else \
- 	  : ; \
- 	fi

  # Define this as empty until I found a useful application.
--- 94,126 ----
  		&& mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot )

  install: install-exec install-data
  install-exec:
  install-data: install-data-@USE_NLS@
! 	if test "$(PACKAGE)" = "gettext"; then \
! 	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
! 	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
! 			  $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
  	else \
! 	  : ; \
  	fi
+ install-data-no: all
+ install-data-yes: all
+ 	$(mkinstalldirs) $(DESTDIR)$(datadir)
  	@catalogs='$(CATALOGS)'; \
  	for cat in $$catalogs; do \
  	  cat=`basename $$cat`; \
! 	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
! 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
! 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
  	  if test -r $$cat; then \
! 	    $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
! 	    echo "installing $$cat as $(DESTDIR)$$dir/$(PACKAGE).mo"; \
  	  else \
! 	    $(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
  	    echo "installing $(srcdir)/$$cat as" \
! 		 "$(DESTDIR)$$dir/$(PACKAGE).mo"; \
  	  fi; \
  	done

  # Define this as empty until I found a useful application.
***************
*** 171,190 ****
  	for cat in $$catalogs; do \
  	  cat=`basename $$cat`; \
! 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
! 	  rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
! 	  rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
! 	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
! 	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
  	done
! 	rm -f $(gettextsrcdir)/po-Makefile.in.in

  check: all

- cat-id-tbl.o: ../intl/libgettext.h
- 
  dvi info tags TAGS ID:

  mostlyclean:
! 	rm -f core core.* *.pox $(PACKAGE).po *.old.po cat-id-tbl.tmp
  	rm -fr *.o

--- 131,149 ----
  	for cat in $$catalogs; do \
  	  cat=`basename $$cat`; \
! 	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
! 	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \
  	done
! 	if test "$(PACKAGE)" = "gettext"; then \
! 	  rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
! 	else \
! 	  : ; \
! 	fi

  check: all

  dvi info tags TAGS ID:

  mostlyclean:
! 	rm -f core core.* *.pox $(PACKAGE).po *.new.po
  	rm -fr *.o

***************
*** 192,196 ****

  distclean: clean
! 	rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m

  maintainer-clean: distclean
--- 151,155 ----

  distclean: clean
! 	rm -f Makefile Makefile.in POTFILES *.mo

  maintainer-clean: distclean
***************
*** 199,244 ****
  	rm -f $(GMOFILES)

! distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
! dist distdir: update-po $(DISTFILES)
  	dists="$(DISTFILES)"; \
  	for file in $$dists; do \
! 	  ln $(srcdir)/$$file $(distdir) 2> /dev/null \
! 	    || cp -p $(srcdir)/$$file $(distdir); \
  	done

  update-po: Makefile
  	$(MAKE) $(PACKAGE).pot
! 	PATH=`pwd`/../src:$$PATH; \
  	cd $(srcdir); \
! 	catalogs='$(CATALOGS)'; \
  	for cat in $$catalogs; do \
  	  cat=`basename $$cat`; \
! 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
! 	  mv $$lang.po $$lang.old.po; \
  	  echo "$$lang:"; \
! 	  if $(MSGMERGE) $$lang.old.po $(PACKAGE).pot -o $$lang.po; then \
! 	    rm -f $$lang.old.po; \
  	  else \
  	    echo "msgmerge for $$cat failed!"; \
! 	    rm -f $$lang.po; \
! 	    mv $$lang.old.po $$lang.po; \
  	  fi; \
  	done

! POTFILES: POTFILES.in
! 	( if test 'x$(srcdir)' != 'x.'; then \
! 	    posrcprefix='$(top_srcdir)/'; \
! 	  else \
! 	    posrcprefix="../"; \
! 	  fi; \
! 	  rm -f $@-t $@ \
! 	    && (sed -e '/^#/d' -e '/^[ 	]*$$/d' \
! 		    -e "s@.*@	$$posrcprefix& \\\\@" < $(srcdir)/$@.in \
! 		| sed -e '$$s/\\$$//') > $@-t \
! 	    && chmod a-w $@-t \
! 	    && mv $@-t $@ )

! Makefile: Makefile.in.in ../config.status POTFILES
! 	cd .. \
  	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
  	       $(SHELL) ./config.status
--- 158,196 ----
  	rm -f $(GMOFILES)

! distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
! dist distdir:
! 	$(MAKE) update-po
! 	@$(MAKE) dist2
! # This is a separate target because 'update-po' must be executed before.
! dist2: $(DISTFILES)
  	dists="$(DISTFILES)"; \
  	for file in $$dists; do \
! 	  if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
! 	  cp -p $$dir/$$file $(distdir); \
  	done

  update-po: Makefile
  	$(MAKE) $(PACKAGE).pot
! 	if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; fi; \
  	cd $(srcdir); \
! 	catalogs='$(GMOFILES)'; \
  	for cat in $$catalogs; do \
  	  cat=`basename $$cat`; \
! 	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
  	  echo "$$lang:"; \
! 	  if $(MSGMERGE) $$lang.po $(PACKAGE).pot -o $$lang.new.po; then \
! 	    mv -f $$lang.new.po $$lang.po; \
  	  else \
  	    echo "msgmerge for $$cat failed!"; \
! 	    rm -f $$lang.new.po; \
  	  fi; \
  	done
+ 	$(MAKE) update-gmo

! update-gmo: Makefile $(GMOFILES)
! 	@:

! Makefile: Makefile.in.in $(top_builddir)/config.status POTFILES.in
! 	cd $(top_builddir) \
  	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
  	       $(SHELL) ./config.status