Contents of /trunk/xscreensaver/patches/xscreensaver-5.08-po-recreate.patch
Parent Directory | Revision Log
Revision 787 -
(show annotations)
(download)
Fri May 8 07:51:46 2009 UTC (15 years, 4 months ago) by niro
File size: 2604 byte(s)
Fri May 8 07:51:46 2009 UTC (15 years, 4 months ago) by niro
File size: 2604 byte(s)
several fixes#
1 | --- xscreensaver-5.08/aclocal.m4.po 2002-05-11 10:44:33.000000000 +0900 |
2 | +++ xscreensaver-5.08/aclocal.m4 2008-12-30 04:33:01.000000000 +0900 |
3 | @@ -252,7 +252,10 @@ |
4 | |
5 | AC_OUTPUT_COMMANDS( |
6 | [case "$CONFIG_FILES" in *po/Makefile.in*) |
7 | + rm -f po/stamp-it po/stamp-it.tmp |
8 | + > po/stamp-it.tmp |
9 | sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile |
10 | + mv po/stamp-it.tmp po/stamp-it |
11 | esac]) |
12 | |
13 | dnl These rules are solely for the distribution goal. While doing this |
14 | --- xscreensaver-5.08/po/Makefile.in.in.po 2007-11-11 09:44:42.000000000 +0900 |
15 | +++ xscreensaver-5.08/po/Makefile.in.in 2008-12-30 04:47:58.000000000 +0900 |
16 | @@ -190,7 +190,7 @@ |
17 | all-yes: $(CATALOGS) |
18 | all-no: |
19 | |
20 | -$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES) |
21 | +$(GETTEXT_PACKAGE).pot: $(POTFILES) |
22 | @INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) ; \ |
23 | export INTLTOOL_EXTRACT ; \ |
24 | echo top_srcdir=$(top_srcdir) $(GENPOT) ; \ |
25 | @@ -274,6 +274,7 @@ |
26 | |
27 | distclean: clean |
28 | rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m *.gmo *.pot |
29 | + rm -f stamp-it |
30 | |
31 | maintainer-clean: distclean |
32 | @echo "This command is intended for maintainers to use;" |
33 | @@ -282,8 +283,8 @@ |
34 | |
35 | depend: |
36 | # fuck off. love, jwz. |
37 | -#distdepend: generate_potfiles_in update-po $(DISTFILES) |
38 | -distdepend:: |
39 | +distdepend: generate_potfiles_in update-po $(DISTFILES) |
40 | +#distdepend:: |
41 | |
42 | |
43 | # jwz: Generates po/POTFILES.in by examining the source tree: |
44 | @@ -292,6 +293,8 @@ |
45 | generate_potfiles_in: |
46 | @tmp=po.$$$$ ; \ |
47 | file=POTFILES.in ; \ |
48 | + echo "sleeping 3 seconds..." ;\ |
49 | + sleep 3; \ |
50 | ( cd $(top_srcdir); \ |
51 | echo "# Auto-generated: `LANG=C date`" ; \ |
52 | ( grep -l '_("' driver/*.[ch] ; \ |
53 | @@ -362,16 +365,22 @@ |
54 | && (sed -e '/^#/d' \ |
55 | -e "s/^\[.*\] +//" \ |
56 | -e '/^[ ]*$$/d' \ |
57 | - -e "s@.*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \ |
58 | + -e "s@.*@ $$posrcprefix& \\\\@" < $@.in \ |
59 | | sed -e '$$s/\\$$//') > $@-t \ |
60 | && chmod a-w $@-t \ |
61 | && mv $@-t $@ ) |
62 | |
63 | +Makefile: stamp-it |
64 | + @if test ! -f $@; then \ |
65 | + rm -f stamp-it; \ |
66 | + $(MAKE) stamp-it; \ |
67 | + fi |
68 | + |
69 | # Please to be fucking the hell off. This breaks "make distdepend". -jwz |
70 | -#Makefile: Makefile.in.in ../config.status POTFILES |
71 | -# cd .. \ |
72 | -# && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ |
73 | -# $(SHELL) ./config.status |
74 | +stamp-it: Makefile.in.in ../config.status POTFILES |
75 | + cd .. \ |
76 | + && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= \ |
77 | + $(SHELL) ./config.status |
78 | |
79 | # Tell versions [3.59,3.63) of GNU make not to export all variables. |
80 | # Otherwise a system limit (for SysV at least) may be exceeded. |