X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=po%2FMakefile.in.in;h=3d4b02480bc25f6a952564189edf66eba1e870a2;hb=6afd6db0ae9396cd7ff897ade597cd5483f49b0e;hp=d01dcdd49e8b4fd61583b4e59df1451d8d23ed0b;hpb=13dbc569cdc6e29019722c0ef9b932a925efbcad;p=xscreensaver

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index d01dcdd4..3d4b0248 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?
@@ -85,6 +85,9 @@
 #       version of) this rule out.
 #
 
+# config.status complains if "po/Makefile.in.in was not created by intltoolize".
+# INTLTOOL_MAKEFILE
+
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
@@ -100,8 +103,10 @@ VPATH = @srcdir@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 #datadir = $(prefix)/@DATADIRNAME@      -- not for xscreensaver
-datadir = @GNOME_DATADIR@
+datadir = @PO_DATADIR@
+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
@@ -139,13 +144,14 @@ 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)
 
 TARFILES = $(DISTFILES_1) $(POFILES) $(SOURCES)
 
 POTFILES = \
+# This comment gets stripped out
 
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
@@ -167,8 +173,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" $<
@@ -187,16 +194,20 @@ default: all
 all-yes: $(CATALOGS)
 all-no:
 
-$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
+$(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 +263,9 @@ uninstall:
 	  done; \
 	done
 
+uninstall-program:
+uninstall-man:
+
 check: all
 
 dvi info tags TAGS ID:
@@ -264,24 +278,29 @@ clean: mostlyclean
 
 distclean: clean
 	rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m *.gmo *.pot
+	rm -f stamp-it
 
 maintainer-clean: distclean
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 	rm -f $(GMOFILES)
 
+depend:
 distdepend: generate_potfiles_in update-po $(DISTFILES)
 
+
 # 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.
 #
 generate_potfiles_in:
 	@tmp=po.$$$$ ;				\
 	 file=POTFILES.in ;			\
+	 echo "sleeping 3 seconds..." ;\
+	 sleep 3; \
 	 ( cd $(top_srcdir);			\
-	   echo "# Auto-generated: `date`" ;	\
+	   echo "# Auto-generated: `LANG=C date`" ;	\
 	   ( grep -l '_("' driver/*.[ch] ;	\
-	     ls driver/*.glade			\
+	     ls driver/*.glade2.in			\
 		driver/*.desktop.in		\
 		hacks/config/*.xml ) | sort	\
 	  ) > $$tmp &&				\
@@ -307,6 +326,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 \
@@ -345,16 +367,22 @@ POTFILES: POTFILES.in
 	    && (sed -e '/^#/d' 						\
 		    -e "s/^\[.*\] +//" 					\
 		    -e '/^[ 	]*$$/d' 				\
-		    -e "s@.*@	$$posrcprefix& \\\\@" < $(srcdir)/$@.in	\
+		    -e "s@.*@	$$posrcprefix& \\\\@" < $@.in		\
 		| sed -e '$$s/\\$$//') > $@-t \
 	    && chmod a-w $@-t \
 	    && mv $@-t $@ )
 
-# Please to be fucking the hell off.   This breaks "make distdepend". -jwz
-#Makefile: Makefile.in.in ../config.status POTFILES
-#	cd .. \
-#	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
-#	       $(SHELL) ./config.status
+# jwz: depending on stamp-it breaks distclean.
+Makefile:
+	@if test ! -f $@; then \
+		rm -f stamp-it; \
+		$(MAKE) stamp-it; \
+	fi
+
+stamp-it: Makefile.in.in ../config.status POTFILES
+	cd .. \
+	  && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= \
+	       $(SHELL) ./config.status
 
 # Tell versions [3.59,3.63) of GNU make not to export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.