projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http://www.jwz.org/xscreensaver/xscreensaver-5.09.tar.gz
[xscreensaver]
/
po
/
Makefile.in.in
diff --git
a/po/Makefile.in.in
b/po/Makefile.in.in
index ca1ab6b297c193e5ec9a70cf5004bd254d2b0832..4b2ebc3ccf5a213df41b18da17ee362ea7678d34 100644
(file)
--- 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
#
# - 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?
# $(gnulocaledir) appropriately.
#
# - WTF is $(gettextsrcdir) doing in here?
@@
-100,15
+100,24
@@
VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
#datadir = $(prefix)/@DATADIRNAME@ -- not for xscreensaver
prefix = @prefix@
exec_prefix = @exec_prefix@
#datadir = $(prefix)/@DATADIRNAME@ -- not for xscreensaver
-datadir = @GNOME_DATADIR@
+datadir = @PO_DATADIR@
+datarootdir = @datarootdir@
localedir = $(datadir)/locale
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
#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@
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@
MKINSTALLDIRS = @MKINSTALLDIRS@
CC = @CC@
@@
-132,7
+141,7
@@
COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
SOURCES =
POFILES = @POFILES@
GMOFILES = @GMOFILES@
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)
DISTFILES = $(DISTFILES_1) $(GETTEXT_PACKAGE).pot \
$(POFILES) $(GMOFILES) $(SOURCES)
@@
-160,8
+169,9
@@
INSTOBJEXT = @INSTOBJEXT@
.po.mo:
$(MSGFMT) -o $@ $<
.po.mo:
$(MSGFMT) -o $@ $<
+# jwz: the "-" means "ignore any errors here, because I don't give a shit."
.po.gmo:
.po.gmo:
- @file=`echo $* | sed 's,.*/,,'`.gmo ; \
+ @
-
file=`echo $* | sed 's,.*/,,'`.gmo ; \
rm -f "$$file" ; \
echo $(GMSGFMT) -o "$$file" $< ; \
$(GMSGFMT) -o "$$file" $<
rm -f "$$file" ; \
echo $(GMSGFMT) -o "$$file" $< ; \
$(GMSGFMT) -o "$$file" $<
@@
-180,16
+190,20
@@
default: all
all-yes: $(CATALOGS)
all-no:
all-yes: $(CATALOGS)
all-no:
-$(
srcdir)/$(
GETTEXT_PACKAGE).pot: $(POTFILES)
+$(GETTEXT_PACKAGE).pot: $(POTFILES)
@INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) ; \
export INTLTOOL_EXTRACT ; \
@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-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
install-data: install-data-@USE_NLS@
install-data-no: all
install-data-yes: all
@@
-245,6
+259,9
@@
uninstall:
done; \
done
done; \
done
+uninstall-program:
+uninstall-man:
+
check: all
dvi info tags TAGS ID:
check: all
dvi info tags TAGS ID:
@@
-257,24
+274,29
@@
clean: mostlyclean
distclean: clean
rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m *.gmo *.pot
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)
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)
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 ; \
# 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); \
( cd $(top_srcdir); \
- echo "# Auto-generated: `
date`" ;
\
+ echo "# Auto-generated: `
LANG=C date`" ;
\
( grep -l '_("' driver/*.[ch] ; \
( grep -l '_("' driver/*.[ch] ; \
- ls driver/*.glade
\
+ ls driver/*.glade
2
\
driver/*.desktop.in \
hacks/config/*.xml ) | sort \
) > $$tmp && \
driver/*.desktop.in \
hacks/config/*.xml ) | sort \
) > $$tmp && \
@@
-300,6
+322,9
@@
update-po: Makefile
for cat in $$catalogs; do \
cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
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 \
cp $$lang.po $$lang.old.po; \
echo $(MSGMERGE) $$lang; \
if $(MSGMERGE) $$lang >/dev/null 2>&1; then \
@@
-338,16
+363,21
@@
POTFILES: POTFILES.in
&& (sed -e '/^#/d' \
-e "s/^\[.*\] +//" \
-e '/^[ ]*$$/d' \
&& (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 $@ )
| 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
+Makefile: stamp-it
+ @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.
# 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.