X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=po%2FMakefile.in.in;h=7589c124c11f574782f5bd2df4acd1cc125d8a5b;hp=ca1ab6b297c193e5ec9a70cf5004bd254d2b0832;hb=ffd8c0873576a9e3065696a624dce6b766b77062;hpb=3f9592851ce4ed76a9979bfdd6ec7dc5c457e183

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index ca1ab6b2..7589c124 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,15 +100,23 @@ 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
 subdir = po
+DESTDIR = $(install_prefix)
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
+
+# #### NO.  This gets me "..//usr/bin/install: No such file or directory".
+# The @MKINSTALLDIRS@ variable must have the absolute (or unqualified)
+# path of the install program.  --jwz.
+# MKINSTALLDIRS = $(top_builddir)/@MKINSTALLDIRS@
+
 MKINSTALLDIRS = @MKINSTALLDIRS@
 
 CC = @CC@
@@ -132,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)
 
@@ -160,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,6 +199,10 @@ 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
@@ -245,6 +258,9 @@ uninstall:
 	  done; \
 	done
 
+uninstall-program:
+uninstall-man:
+
 check: all
 
 dvi info tags TAGS ID:
@@ -263,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.
@@ -275,6 +295,7 @@ generate_potfiles_in:
 	   echo "# Auto-generated: `date`" ;	\
 	   ( grep -l '_("' driver/*.[ch] ;	\
 	     ls driver/*.glade			\
+		driver/*.glade2			\
 		driver/*.desktop.in		\
 		hacks/config/*.xml ) | sort	\
 	  ) > $$tmp &&				\