X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=po%2FMakefile.in.in;h=c2e15de521301d4be9c102e04268f38ab37c7578;hp=001c3d0218afebdf0493b492a91f3ced1b6958ab;hb=07faf451b99879183ed7e909e43a0e065be1ee7f;hpb=723c9eeee862766a1534b2ce17b78adbfac1c3be

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 001c3d02..c2e15de5 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -65,7 +65,7 @@
 #
 #     - For xscreensaver, $(prefix) is generally /usr/X11R6/, but some files
 #	need to go under /usr/ instead of under /usr/X11R6/ -- for those, we
-#	use @GNOME_DATADIR@ instead of @prefix@.  So I changed $(datadir) and
+#	use @PO_DATADIR@ instead of @prefix@.  So I changed $(datadir) and
 #	$(gnulocaledir) appropriately.
 #
 #     - WTF is $(gettextsrcdir) doing in here?
@@ -100,8 +100,9 @@ VPATH = @srcdir@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 #datadir = $(prefix)/@DATADIRNAME@      -- not for xscreensaver
-datadir = @GNOME_DATADIR@
+datadir = @PO_DATADIR@
 localedir = $(datadir)/locale
+#localedir = $(prefix)/share/locale
 #gnulocaledir = $(prefix)/share/locale  -- not for xscreensaver
 gnulocaledir = $(localedir)
 #gettextsrcdir = $(prefix)/share/glib-2.0/gettext/po
@@ -139,7 +140,7 @@ COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
 SOURCES = 
 POFILES = @POFILES@
 GMOFILES = @GMOFILES@
-DISTFILES_1 = ChangeLog Makefile.in.in POTFILES.in
+DISTFILES_1 = ChangeLog Makefile.in.in POTFILES.in update.sh
 DISTFILES = $(DISTFILES_1) $(GETTEXT_PACKAGE).pot \
 	    $(POFILES) $(GMOFILES) $(SOURCES)
 
@@ -167,8 +168,9 @@ INSTOBJEXT = @INSTOBJEXT@
 .po.mo:
 	$(MSGFMT) -o $@ $<
 
+# jwz: the "-" means "ignore any errors here, because I don't give a shit."
 .po.gmo:
-	@file=`echo $* | sed 's,.*/,,'`.gmo ; \
+	@-file=`echo $* | sed 's,.*/,,'`.gmo ; \
 	 rm -f "$$file" ; \
 	 echo $(GMSGFMT) -o "$$file" $< ; \
 	      $(GMSGFMT) -o "$$file" $<
@@ -190,13 +192,17 @@ 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
 
 install: install-exec install-data
 install-exec:
+install-program:
+install-man:
+install-strip:
+tags:
 install-data: install-data-@USE_NLS@
 install-data-no: all
 install-data-yes: all
@@ -252,6 +258,9 @@ uninstall:
 	  done; \
 	done
 
+uninstall-program:
+uninstall-man:
+
 check: all
 
 dvi info tags TAGS ID:
@@ -270,7 +279,11 @@ maintainer-clean: distclean
 	@echo "it deletes files that may require special tools to rebuild."
 	rm -f $(GMOFILES)
 
-distdepend: generate_potfiles_in update-po $(DISTFILES)
+depend:
+# fuck off.  love, jwz.
+#distdepend: generate_potfiles_in update-po $(DISTFILES)
+distdepend::
+
 
 # jwz: Generates po/POTFILES.in by examining the source tree:
 # that way we don't have to keep this list up to date as files are added.
@@ -279,10 +292,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 &&				\
@@ -308,6 +320,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 \