X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=po%2FMakefile.in.in;h=bc121a9629510c017d3522522bb8c3749b41780b;hb=488f2fa8fbdbc77e91a70da2962d73af49e6cace;hp=7bce492ebabede2a53fc865b75420ef94aaf80a9;hpb=e4fa2ac140f7bc56571373a7b7eb585fa4500e38;p=xscreensaver

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 7bce492e..bc121a96 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -101,8 +101,9 @@ prefix = @prefix@
 exec_prefix = @exec_prefix@
 #datadir = $(prefix)/@DATADIRNAME@      -- not for xscreensaver
 datadir = @PO_DATADIR@
-#localedir = $(datadir)/locale
-localedir = $(prefix)/share/locale
+datarootdir = @datarootdir@
+localedir = $(datadir)/locale
+#localedir = $(prefix)/share/locale
 #gnulocaledir = $(prefix)/share/locale  -- not for xscreensaver
 gnulocaledir = $(localedir)
 #gettextsrcdir = $(prefix)/share/glib-2.0/gettext/po
@@ -192,8 +193,8 @@ all-no:
 $(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
 	@INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) ; \
 	export INTLTOOL_EXTRACT ; \
-	echo $(GENPOT) ; \
-	     $(GENPOT)
+	echo top_srcdir=$(top_srcdir) $(GENPOT) ; \
+	     top_srcdir=$(top_srcdir) $(GENPOT)
 
 install-strip: install
 
@@ -292,10 +293,9 @@ generate_potfiles_in:
 	@tmp=po.$$$$ ;				\
 	 file=POTFILES.in ;			\
 	 ( cd $(top_srcdir);			\
-	   echo "# Auto-generated: `date`" ;	\
+	   echo "# Auto-generated: `LANG=C date`" ;	\
 	   ( grep -l '_("' driver/*.[ch] ;	\
-	     ls driver/*.glade			\
-		driver/*.glade2			\
+	     ls driver/*.glade2			\
 		driver/*.desktop.in		\
 		hacks/config/*.xml ) | sort	\
 	  ) > $$tmp &&				\
@@ -321,6 +321,9 @@ update-po: Makefile
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+          if [ ! -f $$lang.po ] ; then \
+             cp $(srcdir)/$$lang.po . ; \
+          fi ; \
 	  cp $$lang.po $$lang.old.po; \
 	  echo $(MSGMERGE) $$lang; \
 	  if   $(MSGMERGE) $$lang >/dev/null 2>&1; then \