1
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/16x16/actions/Makefile.in gnome-icon-theme-2.27.90.new/16x16/actions/Makefile.in
2
--- gnome-icon-theme-2.27.90/16x16/actions/Makefile.in 2009-08-13 03:45:34.000000000 +0200
3
+++ gnome-icon-theme-2.27.90.new/16x16/actions/Makefile.in 2009-08-27 12:38:24.000000000 +0200
5
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
6
+# Makefile.in generated by automake 1.11 from Makefile.am.
9
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
10
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
11
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
13
# This Makefile.in is free software; the Free Software Foundation
14
# gives unlimited permission to copy and/or distribute it,
15
# with or without modifications, as long as this notice is preserved.
19
pkgdatadir = $(datadir)/@PACKAGE@
20
-pkglibdir = $(libdir)/@PACKAGE@
21
pkgincludedir = $(includedir)/@PACKAGE@
22
+pkglibdir = $(libdir)/@PACKAGE@
23
+pkglibexecdir = $(libexecdir)/@PACKAGE@
24
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
25
install_sh_DATA = $(install_sh) -c -m 644
26
install_sh_PROGRAM = $(install_sh) -c
29
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
31
+CONFIG_CLEAN_VPATH_FILES =
34
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
36
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
39
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
40
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
42
+am__nobase_strip_setup = \
43
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
45
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
46
+am__nobase_list = $(am__nobase_strip_setup); \
47
+ for p in $$list; do echo "$$p $$p"; done | \
48
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
49
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
50
+ if (++n[$$2] == $(am__install_max)) \
51
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
52
+ END { for (dir in files) print dir, files[dir] }'
54
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
55
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
56
am__installdirs = "$(DESTDIR)$(iconsdir)"
57
-iconsDATA_INSTALL = $(INSTALL_DATA)
59
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
62
PACKAGE_NAME = @PACKAGE_NAME@
63
PACKAGE_STRING = @PACKAGE_STRING@
64
PACKAGE_TARNAME = @PACKAGE_TARNAME@
65
+PACKAGE_URL = @PACKAGE_URL@
66
PACKAGE_VERSION = @PACKAGE_VERSION@
67
PATH_SEPARATOR = @PATH_SEPARATOR@
68
PKG_CONFIG = @PKG_CONFIG@
73
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/actions/Makefile'; \
74
- cd $(top_srcdir) && \
75
- $(AUTOMAKE) --gnu 16x16/actions/Makefile
76
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/actions/Makefile'; \
77
+ $(am__cd) $(top_srcdir) && \
78
+ $(AUTOMAKE) --gnu 16x16/actions/Makefile
80
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
83
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
84
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
85
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
86
+$(am__aclocal_m4_deps):
87
install-iconsDATA: $(icons_DATA)
89
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
90
- @list='$(icons_DATA)'; for p in $$list; do \
91
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
92
+ for p in $$list; do \
93
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
94
- f=$(am__strip_dir) \
95
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
96
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
98
+ done | $(am__base_list) | \
99
+ while read files; do \
100
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
101
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
106
- @list='$(icons_DATA)'; for p in $$list; do \
107
- f=$(am__strip_dir) \
108
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
109
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
111
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
112
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
113
+ test -n "$$files" || exit 0; \
114
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
115
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
119
@@ -349,13 +371,17 @@
120
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
121
if test -d $$d/$$file; then \
122
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
123
+ if test -d "$(distdir)/$$file"; then \
124
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
126
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
127
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
128
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
129
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
131
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
132
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
134
- test -f $(distdir)/$$file \
135
- || cp -p $$d/$$file $(distdir)/$$file \
136
+ test -f "$(distdir)/$$file" \
137
+ || cp -p $$d/$$file "$(distdir)/$$file" \
144
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
145
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
147
maintainer-clean-generic:
148
@echo "This command is intended for maintainers to use"
158
@@ -413,18 +442,28 @@
160
install-dvi: install-dvi-am
166
install-html: install-html-am
170
install-info: install-info-am
176
install-pdf: install-pdf-am
180
install-ps: install-ps-am
186
maintainer-clean: maintainer-clean-am
192
# Tell versions [3.59,3.63) of GNU make to not export all variables.
193
# Otherwise a system limit (for SysV at least) may be exceeded.
195
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/16x16/animations/Makefile.in gnome-icon-theme-2.27.90.new/16x16/animations/Makefile.in
196
--- gnome-icon-theme-2.27.90/16x16/animations/Makefile.in 2009-08-13 03:45:34.000000000 +0200
197
+++ gnome-icon-theme-2.27.90.new/16x16/animations/Makefile.in 2009-08-27 12:38:24.000000000 +0200
199
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
200
+# Makefile.in generated by automake 1.11 from Makefile.am.
203
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
204
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
205
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
207
# This Makefile.in is free software; the Free Software Foundation
208
# gives unlimited permission to copy and/or distribute it,
209
# with or without modifications, as long as this notice is preserved.
213
pkgdatadir = $(datadir)/@PACKAGE@
214
-pkglibdir = $(libdir)/@PACKAGE@
215
pkgincludedir = $(includedir)/@PACKAGE@
216
+pkglibdir = $(libdir)/@PACKAGE@
217
+pkglibexecdir = $(libexecdir)/@PACKAGE@
218
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
219
install_sh_DATA = $(install_sh) -c -m 644
220
install_sh_PROGRAM = $(install_sh) -c
223
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
225
+CONFIG_CLEAN_VPATH_FILES =
228
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
230
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
233
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
234
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
235
+am__install_max = 40
236
+am__nobase_strip_setup = \
237
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
238
+am__nobase_strip = \
239
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
240
+am__nobase_list = $(am__nobase_strip_setup); \
241
+ for p in $$list; do echo "$$p $$p"; done | \
242
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
243
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
244
+ if (++n[$$2] == $(am__install_max)) \
245
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
246
+ END { for (dir in files) print dir, files[dir] }'
248
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
249
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
250
am__installdirs = "$(DESTDIR)$(iconsdir)"
251
-iconsDATA_INSTALL = $(INSTALL_DATA)
253
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
256
PACKAGE_NAME = @PACKAGE_NAME@
257
PACKAGE_STRING = @PACKAGE_STRING@
258
PACKAGE_TARNAME = @PACKAGE_TARNAME@
259
+PACKAGE_URL = @PACKAGE_URL@
260
PACKAGE_VERSION = @PACKAGE_VERSION@
261
PATH_SEPARATOR = @PATH_SEPARATOR@
262
PKG_CONFIG = @PKG_CONFIG@
267
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/animations/Makefile'; \
268
- cd $(top_srcdir) && \
269
- $(AUTOMAKE) --gnu 16x16/animations/Makefile
270
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/animations/Makefile'; \
271
+ $(am__cd) $(top_srcdir) && \
272
+ $(AUTOMAKE) --gnu 16x16/animations/Makefile
274
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
276
@@ -206,23 +224,27 @@
277
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
278
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
279
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
280
+$(am__aclocal_m4_deps):
281
install-iconsDATA: $(icons_DATA)
283
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
284
- @list='$(icons_DATA)'; for p in $$list; do \
285
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
286
+ for p in $$list; do \
287
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
288
- f=$(am__strip_dir) \
289
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
290
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
292
+ done | $(am__base_list) | \
293
+ while read files; do \
294
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
295
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
300
- @list='$(icons_DATA)'; for p in $$list; do \
301
- f=$(am__strip_dir) \
302
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
303
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
305
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
306
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
307
+ test -n "$$files" || exit 0; \
308
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
309
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
313
@@ -246,13 +268,17 @@
314
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
315
if test -d $$d/$$file; then \
316
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
317
+ if test -d "$(distdir)/$$file"; then \
318
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
320
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
321
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
322
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
323
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
325
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
326
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
328
- test -f $(distdir)/$$file \
329
- || cp -p $$d/$$file $(distdir)/$$file \
330
+ test -f "$(distdir)/$$file" \
331
+ || cp -p $$d/$$file "$(distdir)/$$file" \
338
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
339
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
341
maintainer-clean-generic:
342
@echo "This command is intended for maintainers to use"
352
@@ -310,18 +339,28 @@
354
install-dvi: install-dvi-am
360
install-html: install-html-am
364
install-info: install-info-am
370
install-pdf: install-pdf-am
374
install-ps: install-ps-am
380
maintainer-clean: maintainer-clean-am
386
# Tell versions [3.59,3.63) of GNU make to not export all variables.
387
# Otherwise a system limit (for SysV at least) may be exceeded.
389
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/16x16/apps/Makefile.in gnome-icon-theme-2.27.90.new/16x16/apps/Makefile.in
390
--- gnome-icon-theme-2.27.90/16x16/apps/Makefile.in 2009-08-13 03:45:35.000000000 +0200
391
+++ gnome-icon-theme-2.27.90.new/16x16/apps/Makefile.in 2009-08-27 12:38:24.000000000 +0200
393
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
394
+# Makefile.in generated by automake 1.11 from Makefile.am.
397
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
398
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
399
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
401
# This Makefile.in is free software; the Free Software Foundation
402
# gives unlimited permission to copy and/or distribute it,
403
# with or without modifications, as long as this notice is preserved.
407
pkgdatadir = $(datadir)/@PACKAGE@
408
-pkglibdir = $(libdir)/@PACKAGE@
409
pkgincludedir = $(includedir)/@PACKAGE@
410
+pkglibdir = $(libdir)/@PACKAGE@
411
+pkglibexecdir = $(libexecdir)/@PACKAGE@
412
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
413
install_sh_DATA = $(install_sh) -c -m 644
414
install_sh_PROGRAM = $(install_sh) -c
417
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
419
+CONFIG_CLEAN_VPATH_FILES =
422
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
424
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
427
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
428
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
429
+am__install_max = 40
430
+am__nobase_strip_setup = \
431
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
432
+am__nobase_strip = \
433
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
434
+am__nobase_list = $(am__nobase_strip_setup); \
435
+ for p in $$list; do echo "$$p $$p"; done | \
436
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
437
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
438
+ if (++n[$$2] == $(am__install_max)) \
439
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
440
+ END { for (dir in files) print dir, files[dir] }'
442
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
443
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
444
am__installdirs = "$(DESTDIR)$(iconsdir)"
445
-iconsDATA_INSTALL = $(INSTALL_DATA)
447
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
450
PACKAGE_NAME = @PACKAGE_NAME@
451
PACKAGE_STRING = @PACKAGE_STRING@
452
PACKAGE_TARNAME = @PACKAGE_TARNAME@
453
+PACKAGE_URL = @PACKAGE_URL@
454
PACKAGE_VERSION = @PACKAGE_VERSION@
455
PATH_SEPARATOR = @PATH_SEPARATOR@
456
PKG_CONFIG = @PKG_CONFIG@
461
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/apps/Makefile'; \
462
- cd $(top_srcdir) && \
463
- $(AUTOMAKE) --gnu 16x16/apps/Makefile
464
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/apps/Makefile'; \
465
+ $(am__cd) $(top_srcdir) && \
466
+ $(AUTOMAKE) --gnu 16x16/apps/Makefile
468
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
470
@@ -233,23 +251,27 @@
471
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
472
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
473
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
474
+$(am__aclocal_m4_deps):
475
install-iconsDATA: $(icons_DATA)
477
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
478
- @list='$(icons_DATA)'; for p in $$list; do \
479
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
480
+ for p in $$list; do \
481
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
482
- f=$(am__strip_dir) \
483
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
484
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
486
+ done | $(am__base_list) | \
487
+ while read files; do \
488
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
489
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
494
- @list='$(icons_DATA)'; for p in $$list; do \
495
- f=$(am__strip_dir) \
496
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
497
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
499
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
500
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
501
+ test -n "$$files" || exit 0; \
502
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
503
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
507
@@ -273,13 +295,17 @@
508
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
509
if test -d $$d/$$file; then \
510
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
511
+ if test -d "$(distdir)/$$file"; then \
512
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
514
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
515
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
516
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
517
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
519
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
520
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
522
- test -f $(distdir)/$$file \
523
- || cp -p $$d/$$file $(distdir)/$$file \
524
+ test -f "$(distdir)/$$file" \
525
+ || cp -p $$d/$$file "$(distdir)/$$file" \
532
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
533
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
535
maintainer-clean-generic:
536
@echo "This command is intended for maintainers to use"
546
@@ -336,18 +365,28 @@
548
install-dvi: install-dvi-am
554
install-html: install-html-am
558
install-info: install-info-am
564
install-pdf: install-pdf-am
568
install-ps: install-ps-am
574
maintainer-clean: maintainer-clean-am
580
# Tell versions [3.59,3.63) of GNU make to not export all variables.
581
# Otherwise a system limit (for SysV at least) may be exceeded.
583
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/16x16/categories/Makefile.in gnome-icon-theme-2.27.90.new/16x16/categories/Makefile.in
584
--- gnome-icon-theme-2.27.90/16x16/categories/Makefile.in 2009-08-13 03:45:35.000000000 +0200
585
+++ gnome-icon-theme-2.27.90.new/16x16/categories/Makefile.in 2009-08-27 12:38:24.000000000 +0200
587
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
588
+# Makefile.in generated by automake 1.11 from Makefile.am.
591
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
592
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
593
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
595
# This Makefile.in is free software; the Free Software Foundation
596
# gives unlimited permission to copy and/or distribute it,
597
# with or without modifications, as long as this notice is preserved.
601
pkgdatadir = $(datadir)/@PACKAGE@
602
-pkglibdir = $(libdir)/@PACKAGE@
603
pkgincludedir = $(includedir)/@PACKAGE@
604
+pkglibdir = $(libdir)/@PACKAGE@
605
+pkglibexecdir = $(libexecdir)/@PACKAGE@
606
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
607
install_sh_DATA = $(install_sh) -c -m 644
608
install_sh_PROGRAM = $(install_sh) -c
611
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
613
+CONFIG_CLEAN_VPATH_FILES =
616
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
618
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
621
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
622
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
623
+am__install_max = 40
624
+am__nobase_strip_setup = \
625
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
626
+am__nobase_strip = \
627
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
628
+am__nobase_list = $(am__nobase_strip_setup); \
629
+ for p in $$list; do echo "$$p $$p"; done | \
630
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
631
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
632
+ if (++n[$$2] == $(am__install_max)) \
633
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
634
+ END { for (dir in files) print dir, files[dir] }'
636
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
637
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
638
am__installdirs = "$(DESTDIR)$(iconsdir)"
639
-iconsDATA_INSTALL = $(INSTALL_DATA)
641
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
644
PACKAGE_NAME = @PACKAGE_NAME@
645
PACKAGE_STRING = @PACKAGE_STRING@
646
PACKAGE_TARNAME = @PACKAGE_TARNAME@
647
+PACKAGE_URL = @PACKAGE_URL@
648
PACKAGE_VERSION = @PACKAGE_VERSION@
649
PATH_SEPARATOR = @PATH_SEPARATOR@
650
PKG_CONFIG = @PKG_CONFIG@
655
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/categories/Makefile'; \
656
- cd $(top_srcdir) && \
657
- $(AUTOMAKE) --gnu 16x16/categories/Makefile
658
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/categories/Makefile'; \
659
+ $(am__cd) $(top_srcdir) && \
660
+ $(AUTOMAKE) --gnu 16x16/categories/Makefile
662
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
664
@@ -224,23 +242,27 @@
665
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
666
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
667
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
668
+$(am__aclocal_m4_deps):
669
install-iconsDATA: $(icons_DATA)
671
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
672
- @list='$(icons_DATA)'; for p in $$list; do \
673
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
674
+ for p in $$list; do \
675
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
676
- f=$(am__strip_dir) \
677
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
678
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
680
+ done | $(am__base_list) | \
681
+ while read files; do \
682
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
683
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
688
- @list='$(icons_DATA)'; for p in $$list; do \
689
- f=$(am__strip_dir) \
690
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
691
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
693
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
694
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
695
+ test -n "$$files" || exit 0; \
696
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
697
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
701
@@ -264,13 +286,17 @@
702
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
703
if test -d $$d/$$file; then \
704
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
705
+ if test -d "$(distdir)/$$file"; then \
706
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
708
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
709
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
710
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
711
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
713
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
714
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
716
- test -f $(distdir)/$$file \
717
- || cp -p $$d/$$file $(distdir)/$$file \
718
+ test -f "$(distdir)/$$file" \
719
+ || cp -p $$d/$$file "$(distdir)/$$file" \
726
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
727
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
729
maintainer-clean-generic:
730
@echo "This command is intended for maintainers to use"
740
@@ -328,18 +357,28 @@
742
install-dvi: install-dvi-am
748
install-html: install-html-am
752
install-info: install-info-am
758
install-pdf: install-pdf-am
762
install-ps: install-ps-am
768
maintainer-clean: maintainer-clean-am
774
# Tell versions [3.59,3.63) of GNU make to not export all variables.
775
# Otherwise a system limit (for SysV at least) may be exceeded.
777
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/16x16/devices/Makefile.in gnome-icon-theme-2.27.90.new/16x16/devices/Makefile.in
778
--- gnome-icon-theme-2.27.90/16x16/devices/Makefile.in 2009-08-13 03:45:35.000000000 +0200
779
+++ gnome-icon-theme-2.27.90.new/16x16/devices/Makefile.in 2009-08-27 12:38:24.000000000 +0200
781
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
782
+# Makefile.in generated by automake 1.11 from Makefile.am.
785
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
786
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
787
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
789
# This Makefile.in is free software; the Free Software Foundation
790
# gives unlimited permission to copy and/or distribute it,
791
# with or without modifications, as long as this notice is preserved.
795
pkgdatadir = $(datadir)/@PACKAGE@
796
-pkglibdir = $(libdir)/@PACKAGE@
797
pkgincludedir = $(includedir)/@PACKAGE@
798
+pkglibdir = $(libdir)/@PACKAGE@
799
+pkglibexecdir = $(libexecdir)/@PACKAGE@
800
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
801
install_sh_DATA = $(install_sh) -c -m 644
802
install_sh_PROGRAM = $(install_sh) -c
805
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
807
+CONFIG_CLEAN_VPATH_FILES =
810
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
812
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
815
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
816
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
817
+am__install_max = 40
818
+am__nobase_strip_setup = \
819
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
820
+am__nobase_strip = \
821
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
822
+am__nobase_list = $(am__nobase_strip_setup); \
823
+ for p in $$list; do echo "$$p $$p"; done | \
824
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
825
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
826
+ if (++n[$$2] == $(am__install_max)) \
827
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
828
+ END { for (dir in files) print dir, files[dir] }'
830
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
831
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
832
am__installdirs = "$(DESTDIR)$(iconsdir)"
833
-iconsDATA_INSTALL = $(INSTALL_DATA)
835
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
838
PACKAGE_NAME = @PACKAGE_NAME@
839
PACKAGE_STRING = @PACKAGE_STRING@
840
PACKAGE_TARNAME = @PACKAGE_TARNAME@
841
+PACKAGE_URL = @PACKAGE_URL@
842
PACKAGE_VERSION = @PACKAGE_VERSION@
843
PATH_SEPARATOR = @PATH_SEPARATOR@
844
PKG_CONFIG = @PKG_CONFIG@
849
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/devices/Makefile'; \
850
- cd $(top_srcdir) && \
851
- $(AUTOMAKE) --gnu 16x16/devices/Makefile
852
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/devices/Makefile'; \
853
+ $(am__cd) $(top_srcdir) && \
854
+ $(AUTOMAKE) --gnu 16x16/devices/Makefile
856
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
858
@@ -233,23 +251,27 @@
859
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
860
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
861
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
862
+$(am__aclocal_m4_deps):
863
install-iconsDATA: $(icons_DATA)
865
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
866
- @list='$(icons_DATA)'; for p in $$list; do \
867
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
868
+ for p in $$list; do \
869
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
870
- f=$(am__strip_dir) \
871
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
872
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
874
+ done | $(am__base_list) | \
875
+ while read files; do \
876
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
877
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
882
- @list='$(icons_DATA)'; for p in $$list; do \
883
- f=$(am__strip_dir) \
884
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
885
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
887
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
888
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
889
+ test -n "$$files" || exit 0; \
890
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
891
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
895
@@ -273,13 +295,17 @@
896
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
897
if test -d $$d/$$file; then \
898
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
899
+ if test -d "$(distdir)/$$file"; then \
900
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
902
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
903
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
904
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
905
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
907
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
908
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
910
- test -f $(distdir)/$$file \
911
- || cp -p $$d/$$file $(distdir)/$$file \
912
+ test -f "$(distdir)/$$file" \
913
+ || cp -p $$d/$$file "$(distdir)/$$file" \
920
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
921
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
923
maintainer-clean-generic:
924
@echo "This command is intended for maintainers to use"
934
@@ -337,18 +366,28 @@
936
install-dvi: install-dvi-am
942
install-html: install-html-am
946
install-info: install-info-am
952
install-pdf: install-pdf-am
956
install-ps: install-ps-am
962
maintainer-clean: maintainer-clean-am
968
# Tell versions [3.59,3.63) of GNU make to not export all variables.
969
# Otherwise a system limit (for SysV at least) may be exceeded.
971
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/16x16/emblems/Makefile.in gnome-icon-theme-2.27.90.new/16x16/emblems/Makefile.in
972
--- gnome-icon-theme-2.27.90/16x16/emblems/Makefile.in 2009-08-13 03:45:35.000000000 +0200
973
+++ gnome-icon-theme-2.27.90.new/16x16/emblems/Makefile.in 2009-08-27 12:38:24.000000000 +0200
975
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
976
+# Makefile.in generated by automake 1.11 from Makefile.am.
979
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
980
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
981
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
983
# This Makefile.in is free software; the Free Software Foundation
984
# gives unlimited permission to copy and/or distribute it,
985
# with or without modifications, as long as this notice is preserved.
989
pkgdatadir = $(datadir)/@PACKAGE@
990
-pkglibdir = $(libdir)/@PACKAGE@
991
pkgincludedir = $(includedir)/@PACKAGE@
992
+pkglibdir = $(libdir)/@PACKAGE@
993
+pkglibexecdir = $(libexecdir)/@PACKAGE@
994
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
995
install_sh_DATA = $(install_sh) -c -m 644
996
install_sh_PROGRAM = $(install_sh) -c
999
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
1000
CONFIG_CLEAN_FILES =
1001
+CONFIG_CLEAN_VPATH_FILES =
1004
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
1006
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
1009
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
1010
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
1011
+am__install_max = 40
1012
+am__nobase_strip_setup = \
1013
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
1014
+am__nobase_strip = \
1015
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
1016
+am__nobase_list = $(am__nobase_strip_setup); \
1017
+ for p in $$list; do echo "$$p $$p"; done | \
1018
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
1019
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
1020
+ if (++n[$$2] == $(am__install_max)) \
1021
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
1022
+ END { for (dir in files) print dir, files[dir] }'
1024
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
1025
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
1026
am__installdirs = "$(DESTDIR)$(iconsdir)"
1027
-iconsDATA_INSTALL = $(INSTALL_DATA)
1028
DATA = $(icons_DATA)
1029
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
1032
PACKAGE_NAME = @PACKAGE_NAME@
1033
PACKAGE_STRING = @PACKAGE_STRING@
1034
PACKAGE_TARNAME = @PACKAGE_TARNAME@
1035
+PACKAGE_URL = @PACKAGE_URL@
1036
PACKAGE_VERSION = @PACKAGE_VERSION@
1037
PATH_SEPARATOR = @PATH_SEPARATOR@
1038
PKG_CONFIG = @PKG_CONFIG@
1043
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/emblems/Makefile'; \
1044
- cd $(top_srcdir) && \
1045
- $(AUTOMAKE) --gnu 16x16/emblems/Makefile
1046
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/emblems/Makefile'; \
1047
+ $(am__cd) $(top_srcdir) && \
1048
+ $(AUTOMAKE) --gnu 16x16/emblems/Makefile
1050
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
1052
@@ -222,23 +240,27 @@
1053
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
1054
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
1055
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
1056
+$(am__aclocal_m4_deps):
1057
install-iconsDATA: $(icons_DATA)
1059
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
1060
- @list='$(icons_DATA)'; for p in $$list; do \
1061
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
1062
+ for p in $$list; do \
1063
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
1064
- f=$(am__strip_dir) \
1065
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
1066
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
1068
+ done | $(am__base_list) | \
1069
+ while read files; do \
1070
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
1071
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
1074
uninstall-iconsDATA:
1075
@$(NORMAL_UNINSTALL)
1076
- @list='$(icons_DATA)'; for p in $$list; do \
1077
- f=$(am__strip_dir) \
1078
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
1079
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
1081
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
1082
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
1083
+ test -n "$$files" || exit 0; \
1084
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
1085
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
1089
@@ -262,13 +284,17 @@
1090
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
1091
if test -d $$d/$$file; then \
1092
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
1093
+ if test -d "$(distdir)/$$file"; then \
1094
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
1096
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
1097
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
1098
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
1099
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
1101
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
1102
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
1104
- test -f $(distdir)/$$file \
1105
- || cp -p $$d/$$file $(distdir)/$$file \
1106
+ test -f "$(distdir)/$$file" \
1107
+ || cp -p $$d/$$file "$(distdir)/$$file" \
1114
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
1115
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
1117
maintainer-clean-generic:
1118
@echo "This command is intended for maintainers to use"
1128
@@ -326,18 +355,28 @@
1130
install-dvi: install-dvi-am
1136
install-html: install-html-am
1140
install-info: install-info-am
1146
install-pdf: install-pdf-am
1150
install-ps: install-ps-am
1156
maintainer-clean: maintainer-clean-am
1162
# Tell versions [3.59,3.63) of GNU make to not export all variables.
1163
# Otherwise a system limit (for SysV at least) may be exceeded.
1165
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/16x16/emotes/Makefile.in gnome-icon-theme-2.27.90.new/16x16/emotes/Makefile.in
1166
--- gnome-icon-theme-2.27.90/16x16/emotes/Makefile.in 2009-08-13 03:45:35.000000000 +0200
1167
+++ gnome-icon-theme-2.27.90.new/16x16/emotes/Makefile.in 2009-08-27 12:38:24.000000000 +0200
1169
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
1170
+# Makefile.in generated by automake 1.11 from Makefile.am.
1173
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1174
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
1175
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
1177
# This Makefile.in is free software; the Free Software Foundation
1178
# gives unlimited permission to copy and/or distribute it,
1179
# with or without modifications, as long as this notice is preserved.
1183
pkgdatadir = $(datadir)/@PACKAGE@
1184
-pkglibdir = $(libdir)/@PACKAGE@
1185
pkgincludedir = $(includedir)/@PACKAGE@
1186
+pkglibdir = $(libdir)/@PACKAGE@
1187
+pkglibexecdir = $(libexecdir)/@PACKAGE@
1188
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
1189
install_sh_DATA = $(install_sh) -c -m 644
1190
install_sh_PROGRAM = $(install_sh) -c
1193
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
1194
CONFIG_CLEAN_FILES =
1195
+CONFIG_CLEAN_VPATH_FILES =
1198
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
1200
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
1203
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
1204
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
1205
+am__install_max = 40
1206
+am__nobase_strip_setup = \
1207
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
1208
+am__nobase_strip = \
1209
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
1210
+am__nobase_list = $(am__nobase_strip_setup); \
1211
+ for p in $$list; do echo "$$p $$p"; done | \
1212
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
1213
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
1214
+ if (++n[$$2] == $(am__install_max)) \
1215
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
1216
+ END { for (dir in files) print dir, files[dir] }'
1218
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
1219
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
1220
am__installdirs = "$(DESTDIR)$(iconsdir)"
1221
-iconsDATA_INSTALL = $(INSTALL_DATA)
1222
DATA = $(icons_DATA)
1223
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
1226
PACKAGE_NAME = @PACKAGE_NAME@
1227
PACKAGE_STRING = @PACKAGE_STRING@
1228
PACKAGE_TARNAME = @PACKAGE_TARNAME@
1229
+PACKAGE_URL = @PACKAGE_URL@
1230
PACKAGE_VERSION = @PACKAGE_VERSION@
1231
PATH_SEPARATOR = @PATH_SEPARATOR@
1232
PKG_CONFIG = @PKG_CONFIG@
1237
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/emotes/Makefile'; \
1238
- cd $(top_srcdir) && \
1239
- $(AUTOMAKE) --gnu 16x16/emotes/Makefile
1240
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/emotes/Makefile'; \
1241
+ $(am__cd) $(top_srcdir) && \
1242
+ $(AUTOMAKE) --gnu 16x16/emotes/Makefile
1244
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
1246
@@ -221,23 +239,27 @@
1247
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
1248
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
1249
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
1250
+$(am__aclocal_m4_deps):
1251
install-iconsDATA: $(icons_DATA)
1253
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
1254
- @list='$(icons_DATA)'; for p in $$list; do \
1255
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
1256
+ for p in $$list; do \
1257
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
1258
- f=$(am__strip_dir) \
1259
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
1260
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
1262
+ done | $(am__base_list) | \
1263
+ while read files; do \
1264
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
1265
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
1268
uninstall-iconsDATA:
1269
@$(NORMAL_UNINSTALL)
1270
- @list='$(icons_DATA)'; for p in $$list; do \
1271
- f=$(am__strip_dir) \
1272
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
1273
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
1275
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
1276
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
1277
+ test -n "$$files" || exit 0; \
1278
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
1279
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
1283
@@ -261,13 +283,17 @@
1284
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
1285
if test -d $$d/$$file; then \
1286
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
1287
+ if test -d "$(distdir)/$$file"; then \
1288
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
1290
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
1291
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
1292
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
1293
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
1295
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
1296
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
1298
- test -f $(distdir)/$$file \
1299
- || cp -p $$d/$$file $(distdir)/$$file \
1300
+ test -f "$(distdir)/$$file" \
1301
+ || cp -p $$d/$$file "$(distdir)/$$file" \
1308
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
1309
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
1311
maintainer-clean-generic:
1312
@echo "This command is intended for maintainers to use"
1322
@@ -324,18 +353,28 @@
1324
install-dvi: install-dvi-am
1330
install-html: install-html-am
1334
install-info: install-info-am
1340
install-pdf: install-pdf-am
1344
install-ps: install-ps-am
1350
maintainer-clean: maintainer-clean-am
1356
# Tell versions [3.59,3.63) of GNU make to not export all variables.
1357
# Otherwise a system limit (for SysV at least) may be exceeded.
1359
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/16x16/filesystems/Makefile.in gnome-icon-theme-2.27.90.new/16x16/filesystems/Makefile.in
1360
--- gnome-icon-theme-2.27.90/16x16/filesystems/Makefile.in 2009-08-13 03:45:36.000000000 +0200
1361
+++ gnome-icon-theme-2.27.90.new/16x16/filesystems/Makefile.in 2009-08-27 12:38:24.000000000 +0200
1363
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
1364
+# Makefile.in generated by automake 1.11 from Makefile.am.
1367
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1368
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
1369
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
1371
# This Makefile.in is free software; the Free Software Foundation
1372
# gives unlimited permission to copy and/or distribute it,
1373
# with or without modifications, as long as this notice is preserved.
1377
pkgdatadir = $(datadir)/@PACKAGE@
1378
-pkglibdir = $(libdir)/@PACKAGE@
1379
pkgincludedir = $(includedir)/@PACKAGE@
1380
+pkglibdir = $(libdir)/@PACKAGE@
1381
+pkglibexecdir = $(libexecdir)/@PACKAGE@
1382
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
1383
install_sh_DATA = $(install_sh) -c -m 644
1384
install_sh_PROGRAM = $(install_sh) -c
1387
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
1388
CONFIG_CLEAN_FILES =
1389
+CONFIG_CLEAN_VPATH_FILES =
1392
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
1394
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
1397
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
1398
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
1399
+am__install_max = 40
1400
+am__nobase_strip_setup = \
1401
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
1402
+am__nobase_strip = \
1403
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
1404
+am__nobase_list = $(am__nobase_strip_setup); \
1405
+ for p in $$list; do echo "$$p $$p"; done | \
1406
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
1407
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
1408
+ if (++n[$$2] == $(am__install_max)) \
1409
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
1410
+ END { for (dir in files) print dir, files[dir] }'
1412
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
1413
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
1414
am__installdirs = "$(DESTDIR)$(iconsdir)"
1415
-iconsDATA_INSTALL = $(INSTALL_DATA)
1416
DATA = $(icons_DATA)
1417
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
1420
PACKAGE_NAME = @PACKAGE_NAME@
1421
PACKAGE_STRING = @PACKAGE_STRING@
1422
PACKAGE_TARNAME = @PACKAGE_TARNAME@
1423
+PACKAGE_URL = @PACKAGE_URL@
1424
PACKAGE_VERSION = @PACKAGE_VERSION@
1425
PATH_SEPARATOR = @PATH_SEPARATOR@
1426
PKG_CONFIG = @PKG_CONFIG@
1431
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/filesystems/Makefile'; \
1432
- cd $(top_srcdir) && \
1433
- $(AUTOMAKE) --gnu 16x16/filesystems/Makefile
1434
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/filesystems/Makefile'; \
1435
+ $(am__cd) $(top_srcdir) && \
1436
+ $(AUTOMAKE) --gnu 16x16/filesystems/Makefile
1438
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
1440
@@ -207,23 +225,27 @@
1441
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
1442
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
1443
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
1444
+$(am__aclocal_m4_deps):
1445
install-iconsDATA: $(icons_DATA)
1447
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
1448
- @list='$(icons_DATA)'; for p in $$list; do \
1449
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
1450
+ for p in $$list; do \
1451
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
1452
- f=$(am__strip_dir) \
1453
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
1454
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
1456
+ done | $(am__base_list) | \
1457
+ while read files; do \
1458
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
1459
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
1462
uninstall-iconsDATA:
1463
@$(NORMAL_UNINSTALL)
1464
- @list='$(icons_DATA)'; for p in $$list; do \
1465
- f=$(am__strip_dir) \
1466
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
1467
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
1469
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
1470
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
1471
+ test -n "$$files" || exit 0; \
1472
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
1473
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
1477
@@ -247,13 +269,17 @@
1478
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
1479
if test -d $$d/$$file; then \
1480
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
1481
+ if test -d "$(distdir)/$$file"; then \
1482
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
1484
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
1485
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
1486
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
1487
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
1489
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
1490
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
1492
- test -f $(distdir)/$$file \
1493
- || cp -p $$d/$$file $(distdir)/$$file \
1494
+ test -f "$(distdir)/$$file" \
1495
+ || cp -p $$d/$$file "$(distdir)/$$file" \
1502
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
1503
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
1505
maintainer-clean-generic:
1506
@echo "This command is intended for maintainers to use"
1516
@@ -311,18 +340,28 @@
1518
install-dvi: install-dvi-am
1524
install-html: install-html-am
1528
install-info: install-info-am
1534
install-pdf: install-pdf-am
1538
install-ps: install-ps-am
1544
maintainer-clean: maintainer-clean-am
1550
# Tell versions [3.59,3.63) of GNU make to not export all variables.
1551
# Otherwise a system limit (for SysV at least) may be exceeded.
1553
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/16x16/Makefile.in gnome-icon-theme-2.27.90.new/16x16/Makefile.in
1554
--- gnome-icon-theme-2.27.90/16x16/Makefile.in 2009-08-13 03:45:34.000000000 +0200
1555
+++ gnome-icon-theme-2.27.90.new/16x16/Makefile.in 2009-08-27 12:38:24.000000000 +0200
1557
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
1558
+# Makefile.in generated by automake 1.11 from Makefile.am.
1561
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1562
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
1563
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
1565
# This Makefile.in is free software; the Free Software Foundation
1566
# gives unlimited permission to copy and/or distribute it,
1567
# with or without modifications, as long as this notice is preserved.
1571
pkgdatadir = $(datadir)/@PACKAGE@
1572
-pkglibdir = $(libdir)/@PACKAGE@
1573
pkgincludedir = $(includedir)/@PACKAGE@
1574
+pkglibdir = $(libdir)/@PACKAGE@
1575
+pkglibexecdir = $(libexecdir)/@PACKAGE@
1576
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
1577
install_sh_DATA = $(install_sh) -c -m 644
1578
install_sh_PROGRAM = $(install_sh) -c
1581
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
1582
CONFIG_CLEAN_FILES =
1583
+CONFIG_CLEAN_VPATH_FILES =
1586
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
1588
ps-recursive uninstall-recursive
1589
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
1590
distclean-recursive maintainer-clean-recursive
1591
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
1592
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
1596
DIST_SUBDIRS = $(SUBDIRS)
1597
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
1600
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
1601
+ sed_rest='s,^[^/]*/*,,'; \
1602
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
1603
+ sed_butlast='s,/*[^/]*$$,,'; \
1604
+ while test -n "$$dir1"; do \
1605
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
1606
+ if test "$$first" != "."; then \
1607
+ if test "$$first" = ".."; then \
1608
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
1609
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
1611
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
1612
+ if test "$$first2" = "$$first"; then \
1613
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
1615
+ dir2="../$$dir2"; \
1617
+ dir0="$$dir0"/"$$first"; \
1620
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
1624
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
1625
ALL_LINGUAS = @ALL_LINGUAS@
1627
PACKAGE_NAME = @PACKAGE_NAME@
1628
PACKAGE_STRING = @PACKAGE_STRING@
1629
PACKAGE_TARNAME = @PACKAGE_TARNAME@
1630
+PACKAGE_URL = @PACKAGE_URL@
1631
PACKAGE_VERSION = @PACKAGE_VERSION@
1632
PATH_SEPARATOR = @PATH_SEPARATOR@
1633
PKG_CONFIG = @PKG_CONFIG@
1638
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/Makefile'; \
1639
- cd $(top_srcdir) && \
1640
- $(AUTOMAKE) --gnu 16x16/Makefile
1641
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/Makefile'; \
1642
+ $(am__cd) $(top_srcdir) && \
1643
+ $(AUTOMAKE) --gnu 16x16/Makefile
1645
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
1648
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
1649
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
1650
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
1651
+$(am__aclocal_m4_deps):
1653
# This directory's subdirectories are mostly independent; you can cd
1654
# into them and run `make' without going through this Makefile.
1657
local_target="$$target"; \
1659
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
1660
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
1661
|| eval $$failcom; \
1663
if test "$$dot_seen" = "no"; then \
1664
@@ -272,16 +305,16 @@
1666
local_target="$$target"; \
1668
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
1669
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
1670
|| eval $$failcom; \
1671
done && test -z "$$fail"
1673
list='$(SUBDIRS)'; for subdir in $$list; do \
1674
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
1675
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
1678
list='$(SUBDIRS)'; for subdir in $$list; do \
1679
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
1680
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
1683
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
1686
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
1687
$(TAGS_FILES) $(LISP)
1691
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
1692
include_option=--etags-include; \
1694
list='$(SUBDIRS)'; for subdir in $$list; do \
1695
if test "$$subdir" = .; then :; else \
1696
test ! -f $$subdir/TAGS || \
1697
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
1698
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
1701
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
1702
@@ -317,29 +350,34 @@
1704
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
1705
END { if (nonempty) { for (i in files) print i; }; }'`; \
1706
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
1708
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
1709
test -n "$$unique" || unique=$$empty_fix; \
1710
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
1711
- $$tags $$unique; \
1712
+ if test $$# -gt 0; then \
1713
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
1716
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
1721
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
1722
$(TAGS_FILES) $(LISP)
1724
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
1725
unique=`for i in $$list; do \
1726
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1728
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
1729
END { if (nonempty) { for (i in files) print i; }; }'`; \
1730
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
1731
+ test -z "$(CTAGS_ARGS)$$unique" \
1732
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
1737
here=`$(am__cd) $(top_builddir) && pwd` \
1738
- && cd $(top_srcdir) \
1739
- && gtags -i $(GTAGS_ARGS) $$here
1740
+ && $(am__cd) $(top_srcdir) \
1741
+ && gtags -i $(GTAGS_ARGS) "$$here"
1744
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
1745
@@ -360,29 +398,44 @@
1746
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
1747
if test -d $$d/$$file; then \
1748
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
1749
+ if test -d "$(distdir)/$$file"; then \
1750
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
1752
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
1753
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
1754
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
1755
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
1757
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
1758
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
1760
- test -f $(distdir)/$$file \
1761
- || cp -p $$d/$$file $(distdir)/$$file \
1762
+ test -f "$(distdir)/$$file" \
1763
+ || cp -p $$d/$$file "$(distdir)/$$file" \
1767
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
1768
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
1769
if test "$$subdir" = .; then :; else \
1770
test -d "$(distdir)/$$subdir" \
1771
|| $(MKDIR_P) "$(distdir)/$$subdir" \
1773
- distdir=`$(am__cd) $(distdir) && pwd`; \
1774
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
1778
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
1779
+ if test "$$subdir" = .; then :; else \
1780
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
1781
+ $(am__relativize); \
1782
+ new_distdir=$$reldir; \
1783
+ dir1=$$subdir; dir2="$(top_distdir)"; \
1784
+ $(am__relativize); \
1785
+ new_top_distdir=$$reldir; \
1786
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
1787
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
1788
+ ($(am__cd) $$subdir && \
1789
$(MAKE) $(AM_MAKEFLAGS) \
1790
- top_distdir="$$top_distdir" \
1791
- distdir="$$distdir/$$subdir" \
1792
+ top_distdir="$$new_top_distdir" \
1793
+ distdir="$$new_distdir" \
1794
am__remove_distdir=: \
1795
am__skip_length_check=: \
1796
+ am__skip_mode_fix=: \
1803
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
1804
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
1806
maintainer-clean-generic:
1807
@echo "This command is intended for maintainers to use"
1810
html: html-recursive
1814
info: info-recursive
1817
@@ -439,18 +495,28 @@
1819
install-dvi: install-dvi-recursive
1825
install-html: install-html-recursive
1829
install-info: install-info-recursive
1835
install-pdf: install-pdf-recursive
1839
install-ps: install-ps-recursive
1845
maintainer-clean: maintainer-clean-recursive
1850
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
1852
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
1853
+ install-am install-strip tags-recursive
1855
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
1856
all all-am check check-am clean clean-generic ctags \
1858
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
1859
tags-recursive uninstall uninstall-am
1862
# Tell versions [3.59,3.63) of GNU make to not export all variables.
1863
# Otherwise a system limit (for SysV at least) may be exceeded.
1865
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/16x16/mimetypes/Makefile.in gnome-icon-theme-2.27.90.new/16x16/mimetypes/Makefile.in
1866
--- gnome-icon-theme-2.27.90/16x16/mimetypes/Makefile.in 2009-08-27 12:37:22.000000000 +0200
1867
+++ gnome-icon-theme-2.27.90.new/16x16/mimetypes/Makefile.in 2009-08-27 12:38:25.000000000 +0200
1869
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
1870
+# Makefile.in generated by automake 1.11 from Makefile.am.
1873
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1874
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
1875
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
1877
# This Makefile.in is free software; the Free Software Foundation
1878
# gives unlimited permission to copy and/or distribute it,
1879
# with or without modifications, as long as this notice is preserved.
1883
pkgdatadir = $(datadir)/@PACKAGE@
1884
-pkglibdir = $(libdir)/@PACKAGE@
1885
pkgincludedir = $(includedir)/@PACKAGE@
1886
+pkglibdir = $(libdir)/@PACKAGE@
1887
+pkglibexecdir = $(libexecdir)/@PACKAGE@
1888
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
1889
install_sh_DATA = $(install_sh) -c -m 644
1890
install_sh_PROGRAM = $(install_sh) -c
1893
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
1894
CONFIG_CLEAN_FILES =
1895
+CONFIG_CLEAN_VPATH_FILES =
1898
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
1900
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
1903
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
1904
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
1905
+am__install_max = 40
1906
+am__nobase_strip_setup = \
1907
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
1908
+am__nobase_strip = \
1909
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
1910
+am__nobase_list = $(am__nobase_strip_setup); \
1911
+ for p in $$list; do echo "$$p $$p"; done | \
1912
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
1913
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
1914
+ if (++n[$$2] == $(am__install_max)) \
1915
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
1916
+ END { for (dir in files) print dir, files[dir] }'
1918
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
1919
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
1920
am__installdirs = "$(DESTDIR)$(iconsdir)"
1921
-iconsDATA_INSTALL = $(INSTALL_DATA)
1922
DATA = $(icons_DATA)
1923
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
1926
PACKAGE_NAME = @PACKAGE_NAME@
1927
PACKAGE_STRING = @PACKAGE_STRING@
1928
PACKAGE_TARNAME = @PACKAGE_TARNAME@
1929
+PACKAGE_URL = @PACKAGE_URL@
1930
PACKAGE_VERSION = @PACKAGE_VERSION@
1931
PATH_SEPARATOR = @PATH_SEPARATOR@
1932
PKG_CONFIG = @PKG_CONFIG@
1937
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/mimetypes/Makefile'; \
1938
- cd $(top_srcdir) && \
1939
- $(AUTOMAKE) --gnu 16x16/mimetypes/Makefile
1940
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/mimetypes/Makefile'; \
1941
+ $(am__cd) $(top_srcdir) && \
1942
+ $(AUTOMAKE) --gnu 16x16/mimetypes/Makefile
1944
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
1946
@@ -224,23 +242,27 @@
1947
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
1948
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
1949
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
1950
+$(am__aclocal_m4_deps):
1951
install-iconsDATA: $(icons_DATA)
1953
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
1954
- @list='$(icons_DATA)'; for p in $$list; do \
1955
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
1956
+ for p in $$list; do \
1957
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
1958
- f=$(am__strip_dir) \
1959
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
1960
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
1962
+ done | $(am__base_list) | \
1963
+ while read files; do \
1964
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
1965
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
1968
uninstall-iconsDATA:
1969
@$(NORMAL_UNINSTALL)
1970
- @list='$(icons_DATA)'; for p in $$list; do \
1971
- f=$(am__strip_dir) \
1972
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
1973
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
1975
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
1976
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
1977
+ test -n "$$files" || exit 0; \
1978
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
1979
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
1983
@@ -264,13 +286,17 @@
1984
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
1985
if test -d $$d/$$file; then \
1986
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
1987
+ if test -d "$(distdir)/$$file"; then \
1988
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
1990
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
1991
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
1992
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
1993
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
1995
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
1996
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
1998
- test -f $(distdir)/$$file \
1999
- || cp -p $$d/$$file $(distdir)/$$file \
2000
+ test -f "$(distdir)/$$file" \
2001
+ || cp -p $$d/$$file "$(distdir)/$$file" \
2008
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
2009
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
2011
maintainer-clean-generic:
2012
@echo "This command is intended for maintainers to use"
2022
@@ -328,18 +357,28 @@
2024
install-dvi: install-dvi-am
2030
install-html: install-html-am
2034
install-info: install-info-am
2040
install-pdf: install-pdf-am
2044
install-ps: install-ps-am
2050
maintainer-clean: maintainer-clean-am
2056
# Tell versions [3.59,3.63) of GNU make to not export all variables.
2057
# Otherwise a system limit (for SysV at least) may be exceeded.
2059
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/16x16/places/Makefile.in gnome-icon-theme-2.27.90.new/16x16/places/Makefile.in
2060
--- gnome-icon-theme-2.27.90/16x16/places/Makefile.in 2009-08-13 03:45:36.000000000 +0200
2061
+++ gnome-icon-theme-2.27.90.new/16x16/places/Makefile.in 2009-08-27 12:38:25.000000000 +0200
2063
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
2064
+# Makefile.in generated by automake 1.11 from Makefile.am.
2067
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
2068
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
2069
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
2071
# This Makefile.in is free software; the Free Software Foundation
2072
# gives unlimited permission to copy and/or distribute it,
2073
# with or without modifications, as long as this notice is preserved.
2077
pkgdatadir = $(datadir)/@PACKAGE@
2078
-pkglibdir = $(libdir)/@PACKAGE@
2079
pkgincludedir = $(includedir)/@PACKAGE@
2080
+pkglibdir = $(libdir)/@PACKAGE@
2081
+pkglibexecdir = $(libexecdir)/@PACKAGE@
2082
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
2083
install_sh_DATA = $(install_sh) -c -m 644
2084
install_sh_PROGRAM = $(install_sh) -c
2087
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
2088
CONFIG_CLEAN_FILES =
2089
+CONFIG_CLEAN_VPATH_FILES =
2092
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
2094
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
2097
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
2098
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
2099
+am__install_max = 40
2100
+am__nobase_strip_setup = \
2101
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
2102
+am__nobase_strip = \
2103
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
2104
+am__nobase_list = $(am__nobase_strip_setup); \
2105
+ for p in $$list; do echo "$$p $$p"; done | \
2106
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
2107
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
2108
+ if (++n[$$2] == $(am__install_max)) \
2109
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
2110
+ END { for (dir in files) print dir, files[dir] }'
2112
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
2113
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
2114
am__installdirs = "$(DESTDIR)$(iconsdir)"
2115
-iconsDATA_INSTALL = $(INSTALL_DATA)
2116
DATA = $(icons_DATA)
2117
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
2120
PACKAGE_NAME = @PACKAGE_NAME@
2121
PACKAGE_STRING = @PACKAGE_STRING@
2122
PACKAGE_TARNAME = @PACKAGE_TARNAME@
2123
+PACKAGE_URL = @PACKAGE_URL@
2124
PACKAGE_VERSION = @PACKAGE_VERSION@
2125
PATH_SEPARATOR = @PATH_SEPARATOR@
2126
PKG_CONFIG = @PKG_CONFIG@
2131
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/places/Makefile'; \
2132
- cd $(top_srcdir) && \
2133
- $(AUTOMAKE) --gnu 16x16/places/Makefile
2134
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/places/Makefile'; \
2135
+ $(am__cd) $(top_srcdir) && \
2136
+ $(AUTOMAKE) --gnu 16x16/places/Makefile
2138
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
2140
@@ -216,23 +234,27 @@
2141
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
2142
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
2143
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
2144
+$(am__aclocal_m4_deps):
2145
install-iconsDATA: $(icons_DATA)
2147
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
2148
- @list='$(icons_DATA)'; for p in $$list; do \
2149
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
2150
+ for p in $$list; do \
2151
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
2152
- f=$(am__strip_dir) \
2153
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
2154
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
2156
+ done | $(am__base_list) | \
2157
+ while read files; do \
2158
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
2159
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
2162
uninstall-iconsDATA:
2163
@$(NORMAL_UNINSTALL)
2164
- @list='$(icons_DATA)'; for p in $$list; do \
2165
- f=$(am__strip_dir) \
2166
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
2167
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
2169
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
2170
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
2171
+ test -n "$$files" || exit 0; \
2172
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
2173
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
2177
@@ -256,13 +278,17 @@
2178
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
2179
if test -d $$d/$$file; then \
2180
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
2181
+ if test -d "$(distdir)/$$file"; then \
2182
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
2184
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
2185
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
2186
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
2187
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
2189
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
2190
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
2192
- test -f $(distdir)/$$file \
2193
- || cp -p $$d/$$file $(distdir)/$$file \
2194
+ test -f "$(distdir)/$$file" \
2195
+ || cp -p $$d/$$file "$(distdir)/$$file" \
2202
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
2203
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
2205
maintainer-clean-generic:
2206
@echo "This command is intended for maintainers to use"
2216
@@ -320,18 +349,28 @@
2218
install-dvi: install-dvi-am
2224
install-html: install-html-am
2228
install-info: install-info-am
2234
install-pdf: install-pdf-am
2238
install-ps: install-ps-am
2244
maintainer-clean: maintainer-clean-am
2250
# Tell versions [3.59,3.63) of GNU make to not export all variables.
2251
# Otherwise a system limit (for SysV at least) may be exceeded.
2253
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/16x16/status/Makefile.in gnome-icon-theme-2.27.90.new/16x16/status/Makefile.in
2254
--- gnome-icon-theme-2.27.90/16x16/status/Makefile.in 2009-08-13 03:45:36.000000000 +0200
2255
+++ gnome-icon-theme-2.27.90.new/16x16/status/Makefile.in 2009-08-27 12:38:25.000000000 +0200
2257
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
2258
+# Makefile.in generated by automake 1.11 from Makefile.am.
2261
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
2262
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
2263
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
2265
# This Makefile.in is free software; the Free Software Foundation
2266
# gives unlimited permission to copy and/or distribute it,
2267
# with or without modifications, as long as this notice is preserved.
2271
pkgdatadir = $(datadir)/@PACKAGE@
2272
-pkglibdir = $(libdir)/@PACKAGE@
2273
pkgincludedir = $(includedir)/@PACKAGE@
2274
+pkglibdir = $(libdir)/@PACKAGE@
2275
+pkglibexecdir = $(libexecdir)/@PACKAGE@
2276
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
2277
install_sh_DATA = $(install_sh) -c -m 644
2278
install_sh_PROGRAM = $(install_sh) -c
2281
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
2282
CONFIG_CLEAN_FILES =
2283
+CONFIG_CLEAN_VPATH_FILES =
2286
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
2288
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
2291
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
2292
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
2293
+am__install_max = 40
2294
+am__nobase_strip_setup = \
2295
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
2296
+am__nobase_strip = \
2297
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
2298
+am__nobase_list = $(am__nobase_strip_setup); \
2299
+ for p in $$list; do echo "$$p $$p"; done | \
2300
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
2301
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
2302
+ if (++n[$$2] == $(am__install_max)) \
2303
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
2304
+ END { for (dir in files) print dir, files[dir] }'
2306
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
2307
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
2308
am__installdirs = "$(DESTDIR)$(iconsdir)"
2309
-iconsDATA_INSTALL = $(INSTALL_DATA)
2310
DATA = $(icons_DATA)
2311
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
2314
PACKAGE_NAME = @PACKAGE_NAME@
2315
PACKAGE_STRING = @PACKAGE_STRING@
2316
PACKAGE_TARNAME = @PACKAGE_TARNAME@
2317
+PACKAGE_URL = @PACKAGE_URL@
2318
PACKAGE_VERSION = @PACKAGE_VERSION@
2319
PATH_SEPARATOR = @PATH_SEPARATOR@
2320
PKG_CONFIG = @PKG_CONFIG@
2325
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/status/Makefile'; \
2326
- cd $(top_srcdir) && \
2327
- $(AUTOMAKE) --gnu 16x16/status/Makefile
2328
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/status/Makefile'; \
2329
+ $(am__cd) $(top_srcdir) && \
2330
+ $(AUTOMAKE) --gnu 16x16/status/Makefile
2332
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
2334
@@ -259,23 +277,27 @@
2335
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
2336
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
2337
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
2338
+$(am__aclocal_m4_deps):
2339
install-iconsDATA: $(icons_DATA)
2341
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
2342
- @list='$(icons_DATA)'; for p in $$list; do \
2343
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
2344
+ for p in $$list; do \
2345
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
2346
- f=$(am__strip_dir) \
2347
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
2348
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
2350
+ done | $(am__base_list) | \
2351
+ while read files; do \
2352
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
2353
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
2356
uninstall-iconsDATA:
2357
@$(NORMAL_UNINSTALL)
2358
- @list='$(icons_DATA)'; for p in $$list; do \
2359
- f=$(am__strip_dir) \
2360
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
2361
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
2363
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
2364
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
2365
+ test -n "$$files" || exit 0; \
2366
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
2367
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
2371
@@ -299,13 +321,17 @@
2372
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
2373
if test -d $$d/$$file; then \
2374
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
2375
+ if test -d "$(distdir)/$$file"; then \
2376
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
2378
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
2379
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
2380
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
2381
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
2383
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
2384
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
2386
- test -f $(distdir)/$$file \
2387
- || cp -p $$d/$$file $(distdir)/$$file \
2388
+ test -f "$(distdir)/$$file" \
2389
+ || cp -p $$d/$$file "$(distdir)/$$file" \
2396
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
2397
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
2399
maintainer-clean-generic:
2400
@echo "This command is intended for maintainers to use"
2410
@@ -363,18 +392,28 @@
2412
install-dvi: install-dvi-am
2418
install-html: install-html-am
2422
install-info: install-info-am
2428
install-pdf: install-pdf-am
2432
install-ps: install-ps-am
2438
maintainer-clean: maintainer-clean-am
2444
# Tell versions [3.59,3.63) of GNU make to not export all variables.
2445
# Otherwise a system limit (for SysV at least) may be exceeded.
2447
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/16x16/stock/chart/Makefile.in gnome-icon-theme-2.27.90.new/16x16/stock/chart/Makefile.in
2448
--- gnome-icon-theme-2.27.90/16x16/stock/chart/Makefile.in 2009-08-13 03:45:36.000000000 +0200
2449
+++ gnome-icon-theme-2.27.90.new/16x16/stock/chart/Makefile.in 2009-08-27 12:38:25.000000000 +0200
2451
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
2452
+# Makefile.in generated by automake 1.11 from Makefile.am.
2455
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
2456
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
2457
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
2459
# This Makefile.in is free software; the Free Software Foundation
2460
# gives unlimited permission to copy and/or distribute it,
2461
# with or without modifications, as long as this notice is preserved.
2465
pkgdatadir = $(datadir)/@PACKAGE@
2466
-pkglibdir = $(libdir)/@PACKAGE@
2467
pkgincludedir = $(includedir)/@PACKAGE@
2468
+pkglibdir = $(libdir)/@PACKAGE@
2469
+pkglibexecdir = $(libexecdir)/@PACKAGE@
2470
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
2471
install_sh_DATA = $(install_sh) -c -m 644
2472
install_sh_PROGRAM = $(install_sh) -c
2475
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
2476
CONFIG_CLEAN_FILES =
2477
+CONFIG_CLEAN_VPATH_FILES =
2480
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
2482
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
2485
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
2486
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
2487
+am__install_max = 40
2488
+am__nobase_strip_setup = \
2489
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
2490
+am__nobase_strip = \
2491
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
2492
+am__nobase_list = $(am__nobase_strip_setup); \
2493
+ for p in $$list; do echo "$$p $$p"; done | \
2494
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
2495
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
2496
+ if (++n[$$2] == $(am__install_max)) \
2497
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
2498
+ END { for (dir in files) print dir, files[dir] }'
2500
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
2501
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
2502
am__installdirs = "$(DESTDIR)$(icondir)"
2503
-iconDATA_INSTALL = $(INSTALL_DATA)
2505
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
2508
PACKAGE_NAME = @PACKAGE_NAME@
2509
PACKAGE_STRING = @PACKAGE_STRING@
2510
PACKAGE_TARNAME = @PACKAGE_TARNAME@
2511
+PACKAGE_URL = @PACKAGE_URL@
2512
PACKAGE_VERSION = @PACKAGE_VERSION@
2513
PATH_SEPARATOR = @PATH_SEPARATOR@
2514
PKG_CONFIG = @PKG_CONFIG@
2519
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/stock/chart/Makefile'; \
2520
- cd $(top_srcdir) && \
2521
- $(AUTOMAKE) --gnu 16x16/stock/chart/Makefile
2522
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/stock/chart/Makefile'; \
2523
+ $(am__cd) $(top_srcdir) && \
2524
+ $(AUTOMAKE) --gnu 16x16/stock/chart/Makefile
2526
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
2528
@@ -227,23 +245,27 @@
2529
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
2530
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
2531
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
2532
+$(am__aclocal_m4_deps):
2533
install-iconDATA: $(icon_DATA)
2535
test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
2536
- @list='$(icon_DATA)'; for p in $$list; do \
2537
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
2538
+ for p in $$list; do \
2539
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
2540
- f=$(am__strip_dir) \
2541
- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
2542
- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
2544
+ done | $(am__base_list) | \
2545
+ while read files; do \
2546
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
2547
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
2551
@$(NORMAL_UNINSTALL)
2552
- @list='$(icon_DATA)'; for p in $$list; do \
2553
- f=$(am__strip_dir) \
2554
- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
2555
- rm -f "$(DESTDIR)$(icondir)/$$f"; \
2557
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
2558
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
2559
+ test -n "$$files" || exit 0; \
2560
+ echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
2561
+ cd "$(DESTDIR)$(icondir)" && rm -f $$files
2565
@@ -267,13 +289,17 @@
2566
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
2567
if test -d $$d/$$file; then \
2568
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
2569
+ if test -d "$(distdir)/$$file"; then \
2570
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
2572
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
2573
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
2574
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
2575
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
2577
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
2578
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
2580
- test -f $(distdir)/$$file \
2581
- || cp -p $$d/$$file $(distdir)/$$file \
2582
+ test -f "$(distdir)/$$file" \
2583
+ || cp -p $$d/$$file "$(distdir)/$$file" \
2590
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
2591
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
2593
maintainer-clean-generic:
2594
@echo "This command is intended for maintainers to use"
2604
@@ -330,18 +359,28 @@
2606
install-dvi: install-dvi-am
2612
install-html: install-html-am
2616
install-info: install-info-am
2622
install-pdf: install-pdf-am
2626
install-ps: install-ps-am
2632
maintainer-clean: maintainer-clean-am
2634
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
2635
uninstall-am uninstall-iconDATA
2638
# Tell versions [3.59,3.63) of GNU make to not export all variables.
2639
# Otherwise a system limit (for SysV at least) may be exceeded.
2641
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/16x16/stock/code/Makefile.in gnome-icon-theme-2.27.90.new/16x16/stock/code/Makefile.in
2642
--- gnome-icon-theme-2.27.90/16x16/stock/code/Makefile.in 2009-08-13 03:45:37.000000000 +0200
2643
+++ gnome-icon-theme-2.27.90.new/16x16/stock/code/Makefile.in 2009-08-27 12:38:25.000000000 +0200
2645
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
2646
+# Makefile.in generated by automake 1.11 from Makefile.am.
2649
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
2650
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
2651
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
2653
# This Makefile.in is free software; the Free Software Foundation
2654
# gives unlimited permission to copy and/or distribute it,
2655
# with or without modifications, as long as this notice is preserved.
2659
pkgdatadir = $(datadir)/@PACKAGE@
2660
-pkglibdir = $(libdir)/@PACKAGE@
2661
pkgincludedir = $(includedir)/@PACKAGE@
2662
+pkglibdir = $(libdir)/@PACKAGE@
2663
+pkglibexecdir = $(libexecdir)/@PACKAGE@
2664
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
2665
install_sh_DATA = $(install_sh) -c -m 644
2666
install_sh_PROGRAM = $(install_sh) -c
2669
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
2670
CONFIG_CLEAN_FILES =
2671
+CONFIG_CLEAN_VPATH_FILES =
2674
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
2676
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
2679
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
2680
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
2681
+am__install_max = 40
2682
+am__nobase_strip_setup = \
2683
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
2684
+am__nobase_strip = \
2685
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
2686
+am__nobase_list = $(am__nobase_strip_setup); \
2687
+ for p in $$list; do echo "$$p $$p"; done | \
2688
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
2689
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
2690
+ if (++n[$$2] == $(am__install_max)) \
2691
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
2692
+ END { for (dir in files) print dir, files[dir] }'
2694
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
2695
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
2696
am__installdirs = "$(DESTDIR)$(icondir)"
2697
-iconDATA_INSTALL = $(INSTALL_DATA)
2699
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
2702
PACKAGE_NAME = @PACKAGE_NAME@
2703
PACKAGE_STRING = @PACKAGE_STRING@
2704
PACKAGE_TARNAME = @PACKAGE_TARNAME@
2705
+PACKAGE_URL = @PACKAGE_URL@
2706
PACKAGE_VERSION = @PACKAGE_VERSION@
2707
PATH_SEPARATOR = @PATH_SEPARATOR@
2708
PKG_CONFIG = @PKG_CONFIG@
2713
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/stock/code/Makefile'; \
2714
- cd $(top_srcdir) && \
2715
- $(AUTOMAKE) --gnu 16x16/stock/code/Makefile
2716
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/stock/code/Makefile'; \
2717
+ $(am__cd) $(top_srcdir) && \
2718
+ $(AUTOMAKE) --gnu 16x16/stock/code/Makefile
2720
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
2722
@@ -220,23 +238,27 @@
2723
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
2724
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
2725
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
2726
+$(am__aclocal_m4_deps):
2727
install-iconDATA: $(icon_DATA)
2729
test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
2730
- @list='$(icon_DATA)'; for p in $$list; do \
2731
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
2732
+ for p in $$list; do \
2733
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
2734
- f=$(am__strip_dir) \
2735
- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
2736
- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
2738
+ done | $(am__base_list) | \
2739
+ while read files; do \
2740
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
2741
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
2745
@$(NORMAL_UNINSTALL)
2746
- @list='$(icon_DATA)'; for p in $$list; do \
2747
- f=$(am__strip_dir) \
2748
- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
2749
- rm -f "$(DESTDIR)$(icondir)/$$f"; \
2751
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
2752
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
2753
+ test -n "$$files" || exit 0; \
2754
+ echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
2755
+ cd "$(DESTDIR)$(icondir)" && rm -f $$files
2759
@@ -260,13 +282,17 @@
2760
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
2761
if test -d $$d/$$file; then \
2762
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
2763
+ if test -d "$(distdir)/$$file"; then \
2764
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
2766
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
2767
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
2768
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
2769
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
2771
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
2772
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
2774
- test -f $(distdir)/$$file \
2775
- || cp -p $$d/$$file $(distdir)/$$file \
2776
+ test -f "$(distdir)/$$file" \
2777
+ || cp -p $$d/$$file "$(distdir)/$$file" \
2784
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
2785
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
2787
maintainer-clean-generic:
2788
@echo "This command is intended for maintainers to use"
2798
@@ -323,18 +352,28 @@
2800
install-dvi: install-dvi-am
2806
install-html: install-html-am
2810
install-info: install-info-am
2816
install-pdf: install-pdf-am
2820
install-ps: install-ps-am
2826
maintainer-clean: maintainer-clean-am
2828
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
2829
uninstall-am uninstall-iconDATA
2832
# Tell versions [3.59,3.63) of GNU make to not export all variables.
2833
# Otherwise a system limit (for SysV at least) may be exceeded.
2835
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/16x16/stock/data/Makefile.in gnome-icon-theme-2.27.90.new/16x16/stock/data/Makefile.in
2836
--- gnome-icon-theme-2.27.90/16x16/stock/data/Makefile.in 2009-08-13 03:45:37.000000000 +0200
2837
+++ gnome-icon-theme-2.27.90.new/16x16/stock/data/Makefile.in 2009-08-27 12:38:25.000000000 +0200
2839
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
2840
+# Makefile.in generated by automake 1.11 from Makefile.am.
2843
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
2844
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
2845
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
2847
# This Makefile.in is free software; the Free Software Foundation
2848
# gives unlimited permission to copy and/or distribute it,
2849
# with or without modifications, as long as this notice is preserved.
2853
pkgdatadir = $(datadir)/@PACKAGE@
2854
-pkglibdir = $(libdir)/@PACKAGE@
2855
pkgincludedir = $(includedir)/@PACKAGE@
2856
+pkglibdir = $(libdir)/@PACKAGE@
2857
+pkglibexecdir = $(libexecdir)/@PACKAGE@
2858
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
2859
install_sh_DATA = $(install_sh) -c -m 644
2860
install_sh_PROGRAM = $(install_sh) -c
2863
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
2864
CONFIG_CLEAN_FILES =
2865
+CONFIG_CLEAN_VPATH_FILES =
2868
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
2870
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
2873
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
2874
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
2875
+am__install_max = 40
2876
+am__nobase_strip_setup = \
2877
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
2878
+am__nobase_strip = \
2879
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
2880
+am__nobase_list = $(am__nobase_strip_setup); \
2881
+ for p in $$list; do echo "$$p $$p"; done | \
2882
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
2883
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
2884
+ if (++n[$$2] == $(am__install_max)) \
2885
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
2886
+ END { for (dir in files) print dir, files[dir] }'
2888
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
2889
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
2890
am__installdirs = "$(DESTDIR)$(icondir)"
2891
-iconDATA_INSTALL = $(INSTALL_DATA)
2893
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
2896
PACKAGE_NAME = @PACKAGE_NAME@
2897
PACKAGE_STRING = @PACKAGE_STRING@
2898
PACKAGE_TARNAME = @PACKAGE_TARNAME@
2899
+PACKAGE_URL = @PACKAGE_URL@
2900
PACKAGE_VERSION = @PACKAGE_VERSION@
2901
PATH_SEPARATOR = @PATH_SEPARATOR@
2902
PKG_CONFIG = @PKG_CONFIG@
2907
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/stock/data/Makefile'; \
2908
- cd $(top_srcdir) && \
2909
- $(AUTOMAKE) --gnu 16x16/stock/data/Makefile
2910
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/stock/data/Makefile'; \
2911
+ $(am__cd) $(top_srcdir) && \
2912
+ $(AUTOMAKE) --gnu 16x16/stock/data/Makefile
2914
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
2916
@@ -268,23 +286,27 @@
2917
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
2918
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
2919
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
2920
+$(am__aclocal_m4_deps):
2921
install-iconDATA: $(icon_DATA)
2923
test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
2924
- @list='$(icon_DATA)'; for p in $$list; do \
2925
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
2926
+ for p in $$list; do \
2927
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
2928
- f=$(am__strip_dir) \
2929
- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
2930
- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
2932
+ done | $(am__base_list) | \
2933
+ while read files; do \
2934
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
2935
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
2939
@$(NORMAL_UNINSTALL)
2940
- @list='$(icon_DATA)'; for p in $$list; do \
2941
- f=$(am__strip_dir) \
2942
- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
2943
- rm -f "$(DESTDIR)$(icondir)/$$f"; \
2945
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
2946
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
2947
+ test -n "$$files" || exit 0; \
2948
+ echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
2949
+ cd "$(DESTDIR)$(icondir)" && rm -f $$files
2953
@@ -308,13 +330,17 @@
2954
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
2955
if test -d $$d/$$file; then \
2956
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
2957
+ if test -d "$(distdir)/$$file"; then \
2958
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
2960
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
2961
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
2962
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
2963
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
2965
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
2966
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
2968
- test -f $(distdir)/$$file \
2969
- || cp -p $$d/$$file $(distdir)/$$file \
2970
+ test -f "$(distdir)/$$file" \
2971
+ || cp -p $$d/$$file "$(distdir)/$$file" \
2978
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
2979
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
2981
maintainer-clean-generic:
2982
@echo "This command is intended for maintainers to use"
2992
@@ -371,18 +400,28 @@
2994
install-dvi: install-dvi-am
3000
install-html: install-html-am
3004
install-info: install-info-am
3010
install-pdf: install-pdf-am
3014
install-ps: install-ps-am
3020
maintainer-clean: maintainer-clean-am
3022
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
3023
uninstall-am uninstall-iconDATA
3026
# Tell versions [3.59,3.63) of GNU make to not export all variables.
3027
# Otherwise a system limit (for SysV at least) may be exceeded.
3029
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/16x16/stock/document/Makefile.in gnome-icon-theme-2.27.90.new/16x16/stock/document/Makefile.in
3030
--- gnome-icon-theme-2.27.90/16x16/stock/document/Makefile.in 2009-08-13 03:45:37.000000000 +0200
3031
+++ gnome-icon-theme-2.27.90.new/16x16/stock/document/Makefile.in 2009-08-27 12:38:25.000000000 +0200
3033
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
3034
+# Makefile.in generated by automake 1.11 from Makefile.am.
3037
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
3038
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
3039
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
3041
# This Makefile.in is free software; the Free Software Foundation
3042
# gives unlimited permission to copy and/or distribute it,
3043
# with or without modifications, as long as this notice is preserved.
3047
pkgdatadir = $(datadir)/@PACKAGE@
3048
-pkglibdir = $(libdir)/@PACKAGE@
3049
pkgincludedir = $(includedir)/@PACKAGE@
3050
+pkglibdir = $(libdir)/@PACKAGE@
3051
+pkglibexecdir = $(libexecdir)/@PACKAGE@
3052
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
3053
install_sh_DATA = $(install_sh) -c -m 644
3054
install_sh_PROGRAM = $(install_sh) -c
3057
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
3058
CONFIG_CLEAN_FILES =
3059
+CONFIG_CLEAN_VPATH_FILES =
3062
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
3064
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
3067
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
3068
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
3069
+am__install_max = 40
3070
+am__nobase_strip_setup = \
3071
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
3072
+am__nobase_strip = \
3073
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
3074
+am__nobase_list = $(am__nobase_strip_setup); \
3075
+ for p in $$list; do echo "$$p $$p"; done | \
3076
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
3077
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
3078
+ if (++n[$$2] == $(am__install_max)) \
3079
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
3080
+ END { for (dir in files) print dir, files[dir] }'
3082
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
3083
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
3084
am__installdirs = "$(DESTDIR)$(icondir)"
3085
-iconDATA_INSTALL = $(INSTALL_DATA)
3087
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
3090
PACKAGE_NAME = @PACKAGE_NAME@
3091
PACKAGE_STRING = @PACKAGE_STRING@
3092
PACKAGE_TARNAME = @PACKAGE_TARNAME@
3093
+PACKAGE_URL = @PACKAGE_URL@
3094
PACKAGE_VERSION = @PACKAGE_VERSION@
3095
PATH_SEPARATOR = @PATH_SEPARATOR@
3096
PKG_CONFIG = @PKG_CONFIG@
3101
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/stock/document/Makefile'; \
3102
- cd $(top_srcdir) && \
3103
- $(AUTOMAKE) --gnu 16x16/stock/document/Makefile
3104
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/stock/document/Makefile'; \
3105
+ $(am__cd) $(top_srcdir) && \
3106
+ $(AUTOMAKE) --gnu 16x16/stock/document/Makefile
3108
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
3110
@@ -227,23 +245,27 @@
3111
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
3112
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
3113
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
3114
+$(am__aclocal_m4_deps):
3115
install-iconDATA: $(icon_DATA)
3117
test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
3118
- @list='$(icon_DATA)'; for p in $$list; do \
3119
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
3120
+ for p in $$list; do \
3121
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
3122
- f=$(am__strip_dir) \
3123
- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
3124
- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
3126
+ done | $(am__base_list) | \
3127
+ while read files; do \
3128
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
3129
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
3133
@$(NORMAL_UNINSTALL)
3134
- @list='$(icon_DATA)'; for p in $$list; do \
3135
- f=$(am__strip_dir) \
3136
- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
3137
- rm -f "$(DESTDIR)$(icondir)/$$f"; \
3139
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
3140
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
3141
+ test -n "$$files" || exit 0; \
3142
+ echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
3143
+ cd "$(DESTDIR)$(icondir)" && rm -f $$files
3147
@@ -267,13 +289,17 @@
3148
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
3149
if test -d $$d/$$file; then \
3150
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
3151
+ if test -d "$(distdir)/$$file"; then \
3152
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
3154
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
3155
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
3156
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
3157
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
3159
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
3160
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
3162
- test -f $(distdir)/$$file \
3163
- || cp -p $$d/$$file $(distdir)/$$file \
3164
+ test -f "$(distdir)/$$file" \
3165
+ || cp -p $$d/$$file "$(distdir)/$$file" \
3172
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
3173
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
3175
maintainer-clean-generic:
3176
@echo "This command is intended for maintainers to use"
3186
@@ -330,18 +359,28 @@
3188
install-dvi: install-dvi-am
3194
install-html: install-html-am
3198
install-info: install-info-am
3204
install-pdf: install-pdf-am
3208
install-ps: install-ps-am
3214
maintainer-clean: maintainer-clean-am
3216
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
3217
uninstall-am uninstall-iconDATA
3220
# Tell versions [3.59,3.63) of GNU make to not export all variables.
3221
# Otherwise a system limit (for SysV at least) may be exceeded.
3223
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/16x16/stock/emoticons/Makefile.in gnome-icon-theme-2.27.90.new/16x16/stock/emoticons/Makefile.in
3224
--- gnome-icon-theme-2.27.90/16x16/stock/emoticons/Makefile.in 2009-08-13 03:45:37.000000000 +0200
3225
+++ gnome-icon-theme-2.27.90.new/16x16/stock/emoticons/Makefile.in 2009-08-27 12:38:25.000000000 +0200
3227
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
3228
+# Makefile.in generated by automake 1.11 from Makefile.am.
3231
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
3232
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
3233
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
3235
# This Makefile.in is free software; the Free Software Foundation
3236
# gives unlimited permission to copy and/or distribute it,
3237
# with or without modifications, as long as this notice is preserved.
3241
pkgdatadir = $(datadir)/@PACKAGE@
3242
-pkglibdir = $(libdir)/@PACKAGE@
3243
pkgincludedir = $(includedir)/@PACKAGE@
3244
+pkglibdir = $(libdir)/@PACKAGE@
3245
+pkglibexecdir = $(libexecdir)/@PACKAGE@
3246
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
3247
install_sh_DATA = $(install_sh) -c -m 644
3248
install_sh_PROGRAM = $(install_sh) -c
3251
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
3252
CONFIG_CLEAN_FILES =
3253
+CONFIG_CLEAN_VPATH_FILES =
3256
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
3258
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
3261
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
3262
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
3263
+am__install_max = 40
3264
+am__nobase_strip_setup = \
3265
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
3266
+am__nobase_strip = \
3267
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
3268
+am__nobase_list = $(am__nobase_strip_setup); \
3269
+ for p in $$list; do echo "$$p $$p"; done | \
3270
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
3271
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
3272
+ if (++n[$$2] == $(am__install_max)) \
3273
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
3274
+ END { for (dir in files) print dir, files[dir] }'
3276
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
3277
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
3278
am__installdirs = "$(DESTDIR)$(icondir)"
3279
-iconDATA_INSTALL = $(INSTALL_DATA)
3281
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
3284
PACKAGE_NAME = @PACKAGE_NAME@
3285
PACKAGE_STRING = @PACKAGE_STRING@
3286
PACKAGE_TARNAME = @PACKAGE_TARNAME@
3287
+PACKAGE_URL = @PACKAGE_URL@
3288
PACKAGE_VERSION = @PACKAGE_VERSION@
3289
PATH_SEPARATOR = @PATH_SEPARATOR@
3290
PKG_CONFIG = @PKG_CONFIG@
3295
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/stock/emoticons/Makefile'; \
3296
- cd $(top_srcdir) && \
3297
- $(AUTOMAKE) --gnu 16x16/stock/emoticons/Makefile
3298
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/stock/emoticons/Makefile'; \
3299
+ $(am__cd) $(top_srcdir) && \
3300
+ $(AUTOMAKE) --gnu 16x16/stock/emoticons/Makefile
3302
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
3304
@@ -214,23 +232,27 @@
3305
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
3306
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
3307
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
3308
+$(am__aclocal_m4_deps):
3309
install-iconDATA: $(icon_DATA)
3311
test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
3312
- @list='$(icon_DATA)'; for p in $$list; do \
3313
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
3314
+ for p in $$list; do \
3315
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
3316
- f=$(am__strip_dir) \
3317
- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
3318
- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
3320
+ done | $(am__base_list) | \
3321
+ while read files; do \
3322
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
3323
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
3327
@$(NORMAL_UNINSTALL)
3328
- @list='$(icon_DATA)'; for p in $$list; do \
3329
- f=$(am__strip_dir) \
3330
- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
3331
- rm -f "$(DESTDIR)$(icondir)/$$f"; \
3333
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
3334
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
3335
+ test -n "$$files" || exit 0; \
3336
+ echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
3337
+ cd "$(DESTDIR)$(icondir)" && rm -f $$files
3341
@@ -254,13 +276,17 @@
3342
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
3343
if test -d $$d/$$file; then \
3344
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
3345
+ if test -d "$(distdir)/$$file"; then \
3346
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
3348
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
3349
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
3350
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
3351
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
3353
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
3354
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
3356
- test -f $(distdir)/$$file \
3357
- || cp -p $$d/$$file $(distdir)/$$file \
3358
+ test -f "$(distdir)/$$file" \
3359
+ || cp -p $$d/$$file "$(distdir)/$$file" \
3366
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
3367
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
3369
maintainer-clean-generic:
3370
@echo "This command is intended for maintainers to use"
3380
@@ -317,18 +346,28 @@
3382
install-dvi: install-dvi-am
3388
install-html: install-html-am
3392
install-info: install-info-am
3398
install-pdf: install-pdf-am
3402
install-ps: install-ps-am
3408
maintainer-clean: maintainer-clean-am
3410
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
3411
uninstall-am uninstall-iconDATA
3414
# Tell versions [3.59,3.63) of GNU make to not export all variables.
3415
# Otherwise a system limit (for SysV at least) may be exceeded.
3417
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/16x16/stock/form/Makefile.in gnome-icon-theme-2.27.90.new/16x16/stock/form/Makefile.in
3418
--- gnome-icon-theme-2.27.90/16x16/stock/form/Makefile.in 2009-08-13 03:45:37.000000000 +0200
3419
+++ gnome-icon-theme-2.27.90.new/16x16/stock/form/Makefile.in 2009-08-27 12:38:25.000000000 +0200
3421
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
3422
+# Makefile.in generated by automake 1.11 from Makefile.am.
3425
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
3426
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
3427
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
3429
# This Makefile.in is free software; the Free Software Foundation
3430
# gives unlimited permission to copy and/or distribute it,
3431
# with or without modifications, as long as this notice is preserved.
3435
pkgdatadir = $(datadir)/@PACKAGE@
3436
-pkglibdir = $(libdir)/@PACKAGE@
3437
pkgincludedir = $(includedir)/@PACKAGE@
3438
+pkglibdir = $(libdir)/@PACKAGE@
3439
+pkglibexecdir = $(libexecdir)/@PACKAGE@
3440
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
3441
install_sh_DATA = $(install_sh) -c -m 644
3442
install_sh_PROGRAM = $(install_sh) -c
3445
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
3446
CONFIG_CLEAN_FILES =
3447
+CONFIG_CLEAN_VPATH_FILES =
3450
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
3452
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
3455
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
3456
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
3457
+am__install_max = 40
3458
+am__nobase_strip_setup = \
3459
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
3460
+am__nobase_strip = \
3461
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
3462
+am__nobase_list = $(am__nobase_strip_setup); \
3463
+ for p in $$list; do echo "$$p $$p"; done | \
3464
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
3465
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
3466
+ if (++n[$$2] == $(am__install_max)) \
3467
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
3468
+ END { for (dir in files) print dir, files[dir] }'
3470
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
3471
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
3472
am__installdirs = "$(DESTDIR)$(icondir)"
3473
-iconDATA_INSTALL = $(INSTALL_DATA)
3475
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
3478
PACKAGE_NAME = @PACKAGE_NAME@
3479
PACKAGE_STRING = @PACKAGE_STRING@
3480
PACKAGE_TARNAME = @PACKAGE_TARNAME@
3481
+PACKAGE_URL = @PACKAGE_URL@
3482
PACKAGE_VERSION = @PACKAGE_VERSION@
3483
PATH_SEPARATOR = @PATH_SEPARATOR@
3484
PKG_CONFIG = @PKG_CONFIG@
3489
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/stock/form/Makefile'; \
3490
- cd $(top_srcdir) && \
3491
- $(AUTOMAKE) --gnu 16x16/stock/form/Makefile
3492
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/stock/form/Makefile'; \
3493
+ $(am__cd) $(top_srcdir) && \
3494
+ $(AUTOMAKE) --gnu 16x16/stock/form/Makefile
3496
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
3498
@@ -237,23 +255,27 @@
3499
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
3500
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
3501
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
3502
+$(am__aclocal_m4_deps):
3503
install-iconDATA: $(icon_DATA)
3505
test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
3506
- @list='$(icon_DATA)'; for p in $$list; do \
3507
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
3508
+ for p in $$list; do \
3509
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
3510
- f=$(am__strip_dir) \
3511
- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
3512
- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
3514
+ done | $(am__base_list) | \
3515
+ while read files; do \
3516
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
3517
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
3521
@$(NORMAL_UNINSTALL)
3522
- @list='$(icon_DATA)'; for p in $$list; do \
3523
- f=$(am__strip_dir) \
3524
- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
3525
- rm -f "$(DESTDIR)$(icondir)/$$f"; \
3527
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
3528
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
3529
+ test -n "$$files" || exit 0; \
3530
+ echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
3531
+ cd "$(DESTDIR)$(icondir)" && rm -f $$files
3535
@@ -277,13 +299,17 @@
3536
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
3537
if test -d $$d/$$file; then \
3538
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
3539
+ if test -d "$(distdir)/$$file"; then \
3540
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
3542
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
3543
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
3544
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
3545
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
3547
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
3548
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
3550
- test -f $(distdir)/$$file \
3551
- || cp -p $$d/$$file $(distdir)/$$file \
3552
+ test -f "$(distdir)/$$file" \
3553
+ || cp -p $$d/$$file "$(distdir)/$$file" \
3560
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
3561
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
3563
maintainer-clean-generic:
3564
@echo "This command is intended for maintainers to use"
3574
@@ -340,18 +369,28 @@
3576
install-dvi: install-dvi-am
3582
install-html: install-html-am
3586
install-info: install-info-am
3592
install-pdf: install-pdf-am
3596
install-ps: install-ps-am
3602
maintainer-clean: maintainer-clean-am
3604
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
3605
uninstall-am uninstall-iconDATA
3608
# Tell versions [3.59,3.63) of GNU make to not export all variables.
3609
# Otherwise a system limit (for SysV at least) may be exceeded.
3611
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/16x16/stock/generic/Makefile.in gnome-icon-theme-2.27.90.new/16x16/stock/generic/Makefile.in
3612
--- gnome-icon-theme-2.27.90/16x16/stock/generic/Makefile.in 2009-08-13 03:45:38.000000000 +0200
3613
+++ gnome-icon-theme-2.27.90.new/16x16/stock/generic/Makefile.in 2009-08-27 12:38:25.000000000 +0200
3615
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
3616
+# Makefile.in generated by automake 1.11 from Makefile.am.
3619
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
3620
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
3621
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
3623
# This Makefile.in is free software; the Free Software Foundation
3624
# gives unlimited permission to copy and/or distribute it,
3625
# with or without modifications, as long as this notice is preserved.
3629
pkgdatadir = $(datadir)/@PACKAGE@
3630
-pkglibdir = $(libdir)/@PACKAGE@
3631
pkgincludedir = $(includedir)/@PACKAGE@
3632
+pkglibdir = $(libdir)/@PACKAGE@
3633
+pkglibexecdir = $(libexecdir)/@PACKAGE@
3634
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
3635
install_sh_DATA = $(install_sh) -c -m 644
3636
install_sh_PROGRAM = $(install_sh) -c
3639
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
3640
CONFIG_CLEAN_FILES =
3641
+CONFIG_CLEAN_VPATH_FILES =
3644
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
3646
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
3649
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
3650
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
3651
+am__install_max = 40
3652
+am__nobase_strip_setup = \
3653
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
3654
+am__nobase_strip = \
3655
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
3656
+am__nobase_list = $(am__nobase_strip_setup); \
3657
+ for p in $$list; do echo "$$p $$p"; done | \
3658
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
3659
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
3660
+ if (++n[$$2] == $(am__install_max)) \
3661
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
3662
+ END { for (dir in files) print dir, files[dir] }'
3664
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
3665
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
3666
am__installdirs = "$(DESTDIR)$(icondir)"
3667
-iconDATA_INSTALL = $(INSTALL_DATA)
3669
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
3672
PACKAGE_NAME = @PACKAGE_NAME@
3673
PACKAGE_STRING = @PACKAGE_STRING@
3674
PACKAGE_TARNAME = @PACKAGE_TARNAME@
3675
+PACKAGE_URL = @PACKAGE_URL@
3676
PACKAGE_VERSION = @PACKAGE_VERSION@
3677
PATH_SEPARATOR = @PATH_SEPARATOR@
3678
PKG_CONFIG = @PKG_CONFIG@
3683
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/stock/generic/Makefile'; \
3684
- cd $(top_srcdir) && \
3685
- $(AUTOMAKE) --gnu 16x16/stock/generic/Makefile
3686
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/stock/generic/Makefile'; \
3687
+ $(am__cd) $(top_srcdir) && \
3688
+ $(AUTOMAKE) --gnu 16x16/stock/generic/Makefile
3690
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
3692
@@ -284,23 +302,27 @@
3693
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
3694
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
3695
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
3696
+$(am__aclocal_m4_deps):
3697
install-iconDATA: $(icon_DATA)
3699
test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
3700
- @list='$(icon_DATA)'; for p in $$list; do \
3701
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
3702
+ for p in $$list; do \
3703
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
3704
- f=$(am__strip_dir) \
3705
- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
3706
- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
3708
+ done | $(am__base_list) | \
3709
+ while read files; do \
3710
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
3711
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
3715
@$(NORMAL_UNINSTALL)
3716
- @list='$(icon_DATA)'; for p in $$list; do \
3717
- f=$(am__strip_dir) \
3718
- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
3719
- rm -f "$(DESTDIR)$(icondir)/$$f"; \
3721
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
3722
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
3723
+ test -n "$$files" || exit 0; \
3724
+ echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
3725
+ cd "$(DESTDIR)$(icondir)" && rm -f $$files
3729
@@ -324,13 +346,17 @@
3730
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
3731
if test -d $$d/$$file; then \
3732
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
3733
+ if test -d "$(distdir)/$$file"; then \
3734
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
3736
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
3737
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
3738
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
3739
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
3741
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
3742
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
3744
- test -f $(distdir)/$$file \
3745
- || cp -p $$d/$$file $(distdir)/$$file \
3746
+ test -f "$(distdir)/$$file" \
3747
+ || cp -p $$d/$$file "$(distdir)/$$file" \
3754
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
3755
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
3757
maintainer-clean-generic:
3758
@echo "This command is intended for maintainers to use"
3768
@@ -387,18 +416,28 @@
3770
install-dvi: install-dvi-am
3776
install-html: install-html-am
3780
install-info: install-info-am
3786
install-pdf: install-pdf-am
3790
install-ps: install-ps-am
3796
maintainer-clean: maintainer-clean-am
3798
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
3799
uninstall-am uninstall-iconDATA
3802
# Tell versions [3.59,3.63) of GNU make to not export all variables.
3803
# Otherwise a system limit (for SysV at least) may be exceeded.
3805
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/16x16/stock/image/Makefile.in gnome-icon-theme-2.27.90.new/16x16/stock/image/Makefile.in
3806
--- gnome-icon-theme-2.27.90/16x16/stock/image/Makefile.in 2009-08-13 03:45:38.000000000 +0200
3807
+++ gnome-icon-theme-2.27.90.new/16x16/stock/image/Makefile.in 2009-08-27 12:38:25.000000000 +0200
3809
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
3810
+# Makefile.in generated by automake 1.11 from Makefile.am.
3813
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
3814
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
3815
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
3817
# This Makefile.in is free software; the Free Software Foundation
3818
# gives unlimited permission to copy and/or distribute it,
3819
# with or without modifications, as long as this notice is preserved.
3823
pkgdatadir = $(datadir)/@PACKAGE@
3824
-pkglibdir = $(libdir)/@PACKAGE@
3825
pkgincludedir = $(includedir)/@PACKAGE@
3826
+pkglibdir = $(libdir)/@PACKAGE@
3827
+pkglibexecdir = $(libexecdir)/@PACKAGE@
3828
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
3829
install_sh_DATA = $(install_sh) -c -m 644
3830
install_sh_PROGRAM = $(install_sh) -c
3833
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
3834
CONFIG_CLEAN_FILES =
3835
+CONFIG_CLEAN_VPATH_FILES =
3838
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
3840
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
3843
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
3844
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
3845
+am__install_max = 40
3846
+am__nobase_strip_setup = \
3847
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
3848
+am__nobase_strip = \
3849
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
3850
+am__nobase_list = $(am__nobase_strip_setup); \
3851
+ for p in $$list; do echo "$$p $$p"; done | \
3852
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
3853
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
3854
+ if (++n[$$2] == $(am__install_max)) \
3855
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
3856
+ END { for (dir in files) print dir, files[dir] }'
3858
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
3859
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
3860
am__installdirs = "$(DESTDIR)$(icondir)"
3861
-iconDATA_INSTALL = $(INSTALL_DATA)
3863
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
3866
PACKAGE_NAME = @PACKAGE_NAME@
3867
PACKAGE_STRING = @PACKAGE_STRING@
3868
PACKAGE_TARNAME = @PACKAGE_TARNAME@
3869
+PACKAGE_URL = @PACKAGE_URL@
3870
PACKAGE_VERSION = @PACKAGE_VERSION@
3871
PATH_SEPARATOR = @PATH_SEPARATOR@
3872
PKG_CONFIG = @PKG_CONFIG@
3877
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/stock/image/Makefile'; \
3878
- cd $(top_srcdir) && \
3879
- $(AUTOMAKE) --gnu 16x16/stock/image/Makefile
3880
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/stock/image/Makefile'; \
3881
+ $(am__cd) $(top_srcdir) && \
3882
+ $(AUTOMAKE) --gnu 16x16/stock/image/Makefile
3884
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
3886
@@ -352,23 +370,27 @@
3887
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
3888
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
3889
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
3890
+$(am__aclocal_m4_deps):
3891
install-iconDATA: $(icon_DATA)
3893
test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
3894
- @list='$(icon_DATA)'; for p in $$list; do \
3895
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
3896
+ for p in $$list; do \
3897
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
3898
- f=$(am__strip_dir) \
3899
- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
3900
- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
3902
+ done | $(am__base_list) | \
3903
+ while read files; do \
3904
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
3905
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
3909
@$(NORMAL_UNINSTALL)
3910
- @list='$(icon_DATA)'; for p in $$list; do \
3911
- f=$(am__strip_dir) \
3912
- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
3913
- rm -f "$(DESTDIR)$(icondir)/$$f"; \
3915
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
3916
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
3917
+ test -n "$$files" || exit 0; \
3918
+ echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
3919
+ cd "$(DESTDIR)$(icondir)" && rm -f $$files
3923
@@ -392,13 +414,17 @@
3924
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
3925
if test -d $$d/$$file; then \
3926
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
3927
+ if test -d "$(distdir)/$$file"; then \
3928
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
3930
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
3931
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
3932
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
3933
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
3935
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
3936
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
3938
- test -f $(distdir)/$$file \
3939
- || cp -p $$d/$$file $(distdir)/$$file \
3940
+ test -f "$(distdir)/$$file" \
3941
+ || cp -p $$d/$$file "$(distdir)/$$file" \
3948
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
3949
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
3951
maintainer-clean-generic:
3952
@echo "This command is intended for maintainers to use"
3962
@@ -455,18 +484,28 @@
3964
install-dvi: install-dvi-am
3970
install-html: install-html-am
3974
install-info: install-info-am
3980
install-pdf: install-pdf-am
3984
install-ps: install-ps-am
3990
maintainer-clean: maintainer-clean-am
3992
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
3993
uninstall-am uninstall-iconDATA
3996
# Tell versions [3.59,3.63) of GNU make to not export all variables.
3997
# Otherwise a system limit (for SysV at least) may be exceeded.
3999
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/16x16/stock/io/Makefile.in gnome-icon-theme-2.27.90.new/16x16/stock/io/Makefile.in
4000
--- gnome-icon-theme-2.27.90/16x16/stock/io/Makefile.in 2009-08-13 03:45:38.000000000 +0200
4001
+++ gnome-icon-theme-2.27.90.new/16x16/stock/io/Makefile.in 2009-08-27 12:38:26.000000000 +0200
4003
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
4004
+# Makefile.in generated by automake 1.11 from Makefile.am.
4007
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4008
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
4009
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
4011
# This Makefile.in is free software; the Free Software Foundation
4012
# gives unlimited permission to copy and/or distribute it,
4013
# with or without modifications, as long as this notice is preserved.
4017
pkgdatadir = $(datadir)/@PACKAGE@
4018
-pkglibdir = $(libdir)/@PACKAGE@
4019
pkgincludedir = $(includedir)/@PACKAGE@
4020
+pkglibdir = $(libdir)/@PACKAGE@
4021
+pkglibexecdir = $(libexecdir)/@PACKAGE@
4022
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
4023
install_sh_DATA = $(install_sh) -c -m 644
4024
install_sh_PROGRAM = $(install_sh) -c
4027
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
4028
CONFIG_CLEAN_FILES =
4029
+CONFIG_CLEAN_VPATH_FILES =
4032
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
4034
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
4037
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
4038
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
4039
+am__install_max = 40
4040
+am__nobase_strip_setup = \
4041
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
4042
+am__nobase_strip = \
4043
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
4044
+am__nobase_list = $(am__nobase_strip_setup); \
4045
+ for p in $$list; do echo "$$p $$p"; done | \
4046
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
4047
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
4048
+ if (++n[$$2] == $(am__install_max)) \
4049
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
4050
+ END { for (dir in files) print dir, files[dir] }'
4052
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
4053
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
4054
am__installdirs = "$(DESTDIR)$(icondir)"
4055
-iconDATA_INSTALL = $(INSTALL_DATA)
4057
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
4060
PACKAGE_NAME = @PACKAGE_NAME@
4061
PACKAGE_STRING = @PACKAGE_STRING@
4062
PACKAGE_TARNAME = @PACKAGE_TARNAME@
4063
+PACKAGE_URL = @PACKAGE_URL@
4064
PACKAGE_VERSION = @PACKAGE_VERSION@
4065
PATH_SEPARATOR = @PATH_SEPARATOR@
4066
PKG_CONFIG = @PKG_CONFIG@
4071
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/stock/io/Makefile'; \
4072
- cd $(top_srcdir) && \
4073
- $(AUTOMAKE) --gnu 16x16/stock/io/Makefile
4074
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/stock/io/Makefile'; \
4075
+ $(am__cd) $(top_srcdir) && \
4076
+ $(AUTOMAKE) --gnu 16x16/stock/io/Makefile
4078
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
4080
@@ -215,23 +233,27 @@
4081
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
4082
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
4083
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
4084
+$(am__aclocal_m4_deps):
4085
install-iconDATA: $(icon_DATA)
4087
test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
4088
- @list='$(icon_DATA)'; for p in $$list; do \
4089
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
4090
+ for p in $$list; do \
4091
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
4092
- f=$(am__strip_dir) \
4093
- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
4094
- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
4096
+ done | $(am__base_list) | \
4097
+ while read files; do \
4098
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
4099
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
4103
@$(NORMAL_UNINSTALL)
4104
- @list='$(icon_DATA)'; for p in $$list; do \
4105
- f=$(am__strip_dir) \
4106
- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
4107
- rm -f "$(DESTDIR)$(icondir)/$$f"; \
4109
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
4110
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
4111
+ test -n "$$files" || exit 0; \
4112
+ echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
4113
+ cd "$(DESTDIR)$(icondir)" && rm -f $$files
4117
@@ -255,13 +277,17 @@
4118
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
4119
if test -d $$d/$$file; then \
4120
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
4121
+ if test -d "$(distdir)/$$file"; then \
4122
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
4124
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
4125
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
4126
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
4127
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
4129
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
4130
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
4132
- test -f $(distdir)/$$file \
4133
- || cp -p $$d/$$file $(distdir)/$$file \
4134
+ test -f "$(distdir)/$$file" \
4135
+ || cp -p $$d/$$file "$(distdir)/$$file" \
4142
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
4143
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
4145
maintainer-clean-generic:
4146
@echo "This command is intended for maintainers to use"
4156
@@ -318,18 +347,28 @@
4158
install-dvi: install-dvi-am
4164
install-html: install-html-am
4168
install-info: install-info-am
4174
install-pdf: install-pdf-am
4178
install-ps: install-ps-am
4184
maintainer-clean: maintainer-clean-am
4186
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
4187
uninstall-am uninstall-iconDATA
4190
# Tell versions [3.59,3.63) of GNU make to not export all variables.
4191
# Otherwise a system limit (for SysV at least) may be exceeded.
4193
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/16x16/stock/Makefile.in gnome-icon-theme-2.27.90.new/16x16/stock/Makefile.in
4194
--- gnome-icon-theme-2.27.90/16x16/stock/Makefile.in 2009-08-13 03:45:36.000000000 +0200
4195
+++ gnome-icon-theme-2.27.90.new/16x16/stock/Makefile.in 2009-08-27 12:38:25.000000000 +0200
4197
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
4198
+# Makefile.in generated by automake 1.11 from Makefile.am.
4201
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4202
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
4203
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
4205
# This Makefile.in is free software; the Free Software Foundation
4206
# gives unlimited permission to copy and/or distribute it,
4207
# with or without modifications, as long as this notice is preserved.
4211
pkgdatadir = $(datadir)/@PACKAGE@
4212
-pkglibdir = $(libdir)/@PACKAGE@
4213
pkgincludedir = $(includedir)/@PACKAGE@
4214
+pkglibdir = $(libdir)/@PACKAGE@
4215
+pkglibexecdir = $(libexecdir)/@PACKAGE@
4216
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
4217
install_sh_DATA = $(install_sh) -c -m 644
4218
install_sh_PROGRAM = $(install_sh) -c
4221
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
4222
CONFIG_CLEAN_FILES =
4223
+CONFIG_CLEAN_VPATH_FILES =
4226
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
4228
ps-recursive uninstall-recursive
4229
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
4230
distclean-recursive maintainer-clean-recursive
4231
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
4232
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
4236
DIST_SUBDIRS = $(SUBDIRS)
4237
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
4240
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
4241
+ sed_rest='s,^[^/]*/*,,'; \
4242
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
4243
+ sed_butlast='s,/*[^/]*$$,,'; \
4244
+ while test -n "$$dir1"; do \
4245
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
4246
+ if test "$$first" != "."; then \
4247
+ if test "$$first" = ".."; then \
4248
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
4249
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
4251
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
4252
+ if test "$$first2" = "$$first"; then \
4253
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
4255
+ dir2="../$$dir2"; \
4257
+ dir0="$$dir0"/"$$first"; \
4260
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
4264
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
4265
ALL_LINGUAS = @ALL_LINGUAS@
4267
PACKAGE_NAME = @PACKAGE_NAME@
4268
PACKAGE_STRING = @PACKAGE_STRING@
4269
PACKAGE_TARNAME = @PACKAGE_TARNAME@
4270
+PACKAGE_URL = @PACKAGE_URL@
4271
PACKAGE_VERSION = @PACKAGE_VERSION@
4272
PATH_SEPARATOR = @PATH_SEPARATOR@
4273
PKG_CONFIG = @PKG_CONFIG@
4278
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/stock/Makefile'; \
4279
- cd $(top_srcdir) && \
4280
- $(AUTOMAKE) --gnu 16x16/stock/Makefile
4281
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/stock/Makefile'; \
4282
+ $(am__cd) $(top_srcdir) && \
4283
+ $(AUTOMAKE) --gnu 16x16/stock/Makefile
4285
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
4288
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
4289
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
4290
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
4291
+$(am__aclocal_m4_deps):
4293
# This directory's subdirectories are mostly independent; you can cd
4294
# into them and run `make' without going through this Makefile.
4297
local_target="$$target"; \
4299
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
4300
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
4301
|| eval $$failcom; \
4303
if test "$$dot_seen" = "no"; then \
4304
@@ -258,16 +291,16 @@
4306
local_target="$$target"; \
4308
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
4309
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
4310
|| eval $$failcom; \
4311
done && test -z "$$fail"
4313
list='$(SUBDIRS)'; for subdir in $$list; do \
4314
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
4315
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
4318
list='$(SUBDIRS)'; for subdir in $$list; do \
4319
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
4320
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
4323
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
4326
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
4327
$(TAGS_FILES) $(LISP)
4331
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
4332
include_option=--etags-include; \
4334
list='$(SUBDIRS)'; for subdir in $$list; do \
4335
if test "$$subdir" = .; then :; else \
4336
test ! -f $$subdir/TAGS || \
4337
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
4338
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
4341
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
4342
@@ -303,29 +336,34 @@
4344
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
4345
END { if (nonempty) { for (i in files) print i; }; }'`; \
4346
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
4348
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
4349
test -n "$$unique" || unique=$$empty_fix; \
4350
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
4351
- $$tags $$unique; \
4352
+ if test $$# -gt 0; then \
4353
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
4356
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
4361
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
4362
$(TAGS_FILES) $(LISP)
4364
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
4365
unique=`for i in $$list; do \
4366
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
4368
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
4369
END { if (nonempty) { for (i in files) print i; }; }'`; \
4370
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
4371
+ test -z "$(CTAGS_ARGS)$$unique" \
4372
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
4377
here=`$(am__cd) $(top_builddir) && pwd` \
4378
- && cd $(top_srcdir) \
4379
- && gtags -i $(GTAGS_ARGS) $$here
4380
+ && $(am__cd) $(top_srcdir) \
4381
+ && gtags -i $(GTAGS_ARGS) "$$here"
4384
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
4385
@@ -346,29 +384,44 @@
4386
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
4387
if test -d $$d/$$file; then \
4388
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
4389
+ if test -d "$(distdir)/$$file"; then \
4390
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
4392
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
4393
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
4394
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
4395
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
4397
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
4398
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
4400
- test -f $(distdir)/$$file \
4401
- || cp -p $$d/$$file $(distdir)/$$file \
4402
+ test -f "$(distdir)/$$file" \
4403
+ || cp -p $$d/$$file "$(distdir)/$$file" \
4407
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
4408
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
4409
if test "$$subdir" = .; then :; else \
4410
test -d "$(distdir)/$$subdir" \
4411
|| $(MKDIR_P) "$(distdir)/$$subdir" \
4413
- distdir=`$(am__cd) $(distdir) && pwd`; \
4414
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
4418
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
4419
+ if test "$$subdir" = .; then :; else \
4420
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
4421
+ $(am__relativize); \
4422
+ new_distdir=$$reldir; \
4423
+ dir1=$$subdir; dir2="$(top_distdir)"; \
4424
+ $(am__relativize); \
4425
+ new_top_distdir=$$reldir; \
4426
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
4427
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
4428
+ ($(am__cd) $$subdir && \
4429
$(MAKE) $(AM_MAKEFLAGS) \
4430
- top_distdir="$$top_distdir" \
4431
- distdir="$$distdir/$$subdir" \
4432
+ top_distdir="$$new_top_distdir" \
4433
+ distdir="$$new_distdir" \
4434
am__remove_distdir=: \
4435
am__skip_length_check=: \
4436
+ am__skip_mode_fix=: \
4443
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
4444
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
4446
maintainer-clean-generic:
4447
@echo "This command is intended for maintainers to use"
4450
html: html-recursive
4454
info: info-recursive
4457
@@ -424,18 +480,28 @@
4459
install-dvi: install-dvi-recursive
4465
install-html: install-html-recursive
4469
install-info: install-info-recursive
4475
install-pdf: install-pdf-recursive
4479
install-ps: install-ps-recursive
4485
maintainer-clean: maintainer-clean-recursive
4490
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
4492
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
4493
+ install-am install-strip tags-recursive
4495
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
4496
all all-am check check-am clean clean-generic ctags \
4498
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
4499
tags-recursive uninstall uninstall-am
4502
# Tell versions [3.59,3.63) of GNU make to not export all variables.
4503
# Otherwise a system limit (for SysV at least) may be exceeded.
4505
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/16x16/stock/media/Makefile.in gnome-icon-theme-2.27.90.new/16x16/stock/media/Makefile.in
4506
--- gnome-icon-theme-2.27.90/16x16/stock/media/Makefile.in 2009-08-13 03:45:38.000000000 +0200
4507
+++ gnome-icon-theme-2.27.90.new/16x16/stock/media/Makefile.in 2009-08-27 12:38:26.000000000 +0200
4509
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
4510
+# Makefile.in generated by automake 1.11 from Makefile.am.
4513
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4514
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
4515
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
4517
# This Makefile.in is free software; the Free Software Foundation
4518
# gives unlimited permission to copy and/or distribute it,
4519
# with or without modifications, as long as this notice is preserved.
4523
pkgdatadir = $(datadir)/@PACKAGE@
4524
-pkglibdir = $(libdir)/@PACKAGE@
4525
pkgincludedir = $(includedir)/@PACKAGE@
4526
+pkglibdir = $(libdir)/@PACKAGE@
4527
+pkglibexecdir = $(libexecdir)/@PACKAGE@
4528
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
4529
install_sh_DATA = $(install_sh) -c -m 644
4530
install_sh_PROGRAM = $(install_sh) -c
4533
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
4534
CONFIG_CLEAN_FILES =
4535
+CONFIG_CLEAN_VPATH_FILES =
4538
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
4540
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
4543
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
4544
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
4545
+am__install_max = 40
4546
+am__nobase_strip_setup = \
4547
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
4548
+am__nobase_strip = \
4549
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
4550
+am__nobase_list = $(am__nobase_strip_setup); \
4551
+ for p in $$list; do echo "$$p $$p"; done | \
4552
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
4553
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
4554
+ if (++n[$$2] == $(am__install_max)) \
4555
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
4556
+ END { for (dir in files) print dir, files[dir] }'
4558
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
4559
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
4560
am__installdirs = "$(DESTDIR)$(icondir)"
4561
-iconDATA_INSTALL = $(INSTALL_DATA)
4563
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
4566
PACKAGE_NAME = @PACKAGE_NAME@
4567
PACKAGE_STRING = @PACKAGE_STRING@
4568
PACKAGE_TARNAME = @PACKAGE_TARNAME@
4569
+PACKAGE_URL = @PACKAGE_URL@
4570
PACKAGE_VERSION = @PACKAGE_VERSION@
4571
PATH_SEPARATOR = @PATH_SEPARATOR@
4572
PKG_CONFIG = @PKG_CONFIG@
4577
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/stock/media/Makefile'; \
4578
- cd $(top_srcdir) && \
4579
- $(AUTOMAKE) --gnu 16x16/stock/media/Makefile
4580
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/stock/media/Makefile'; \
4581
+ $(am__cd) $(top_srcdir) && \
4582
+ $(AUTOMAKE) --gnu 16x16/stock/media/Makefile
4584
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
4586
@@ -212,23 +230,27 @@
4587
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
4588
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
4589
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
4590
+$(am__aclocal_m4_deps):
4591
install-iconDATA: $(icon_DATA)
4593
test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
4594
- @list='$(icon_DATA)'; for p in $$list; do \
4595
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
4596
+ for p in $$list; do \
4597
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
4598
- f=$(am__strip_dir) \
4599
- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
4600
- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
4602
+ done | $(am__base_list) | \
4603
+ while read files; do \
4604
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
4605
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
4609
@$(NORMAL_UNINSTALL)
4610
- @list='$(icon_DATA)'; for p in $$list; do \
4611
- f=$(am__strip_dir) \
4612
- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
4613
- rm -f "$(DESTDIR)$(icondir)/$$f"; \
4615
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
4616
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
4617
+ test -n "$$files" || exit 0; \
4618
+ echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
4619
+ cd "$(DESTDIR)$(icondir)" && rm -f $$files
4623
@@ -252,13 +274,17 @@
4624
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
4625
if test -d $$d/$$file; then \
4626
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
4627
+ if test -d "$(distdir)/$$file"; then \
4628
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
4630
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
4631
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
4632
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
4633
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
4635
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
4636
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
4638
- test -f $(distdir)/$$file \
4639
- || cp -p $$d/$$file $(distdir)/$$file \
4640
+ test -f "$(distdir)/$$file" \
4641
+ || cp -p $$d/$$file "$(distdir)/$$file" \
4648
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
4649
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
4651
maintainer-clean-generic:
4652
@echo "This command is intended for maintainers to use"
4662
@@ -315,18 +344,28 @@
4664
install-dvi: install-dvi-am
4670
install-html: install-html-am
4674
install-info: install-info-am
4680
install-pdf: install-pdf-am
4684
install-ps: install-ps-am
4690
maintainer-clean: maintainer-clean-am
4692
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
4693
uninstall-am uninstall-iconDATA
4696
# Tell versions [3.59,3.63) of GNU make to not export all variables.
4697
# Otherwise a system limit (for SysV at least) may be exceeded.
4699
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/16x16/stock/navigation/Makefile.in gnome-icon-theme-2.27.90.new/16x16/stock/navigation/Makefile.in
4700
--- gnome-icon-theme-2.27.90/16x16/stock/navigation/Makefile.in 2009-08-13 03:45:38.000000000 +0200
4701
+++ gnome-icon-theme-2.27.90.new/16x16/stock/navigation/Makefile.in 2009-08-27 12:38:26.000000000 +0200
4703
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
4704
+# Makefile.in generated by automake 1.11 from Makefile.am.
4707
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4708
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
4709
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
4711
# This Makefile.in is free software; the Free Software Foundation
4712
# gives unlimited permission to copy and/or distribute it,
4713
# with or without modifications, as long as this notice is preserved.
4717
pkgdatadir = $(datadir)/@PACKAGE@
4718
-pkglibdir = $(libdir)/@PACKAGE@
4719
pkgincludedir = $(includedir)/@PACKAGE@
4720
+pkglibdir = $(libdir)/@PACKAGE@
4721
+pkglibexecdir = $(libexecdir)/@PACKAGE@
4722
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
4723
install_sh_DATA = $(install_sh) -c -m 644
4724
install_sh_PROGRAM = $(install_sh) -c
4727
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
4728
CONFIG_CLEAN_FILES =
4729
+CONFIG_CLEAN_VPATH_FILES =
4732
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
4734
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
4737
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
4738
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
4739
+am__install_max = 40
4740
+am__nobase_strip_setup = \
4741
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
4742
+am__nobase_strip = \
4743
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
4744
+am__nobase_list = $(am__nobase_strip_setup); \
4745
+ for p in $$list; do echo "$$p $$p"; done | \
4746
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
4747
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
4748
+ if (++n[$$2] == $(am__install_max)) \
4749
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
4750
+ END { for (dir in files) print dir, files[dir] }'
4752
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
4753
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
4754
am__installdirs = "$(DESTDIR)$(icondir)"
4755
-iconDATA_INSTALL = $(INSTALL_DATA)
4757
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
4760
PACKAGE_NAME = @PACKAGE_NAME@
4761
PACKAGE_STRING = @PACKAGE_STRING@
4762
PACKAGE_TARNAME = @PACKAGE_TARNAME@
4763
+PACKAGE_URL = @PACKAGE_URL@
4764
PACKAGE_VERSION = @PACKAGE_VERSION@
4765
PATH_SEPARATOR = @PATH_SEPARATOR@
4766
PKG_CONFIG = @PKG_CONFIG@
4771
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/stock/navigation/Makefile'; \
4772
- cd $(top_srcdir) && \
4773
- $(AUTOMAKE) --gnu 16x16/stock/navigation/Makefile
4774
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/stock/navigation/Makefile'; \
4775
+ $(am__cd) $(top_srcdir) && \
4776
+ $(AUTOMAKE) --gnu 16x16/stock/navigation/Makefile
4778
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
4780
@@ -258,23 +276,27 @@
4781
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
4782
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
4783
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
4784
+$(am__aclocal_m4_deps):
4785
install-iconDATA: $(icon_DATA)
4787
test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
4788
- @list='$(icon_DATA)'; for p in $$list; do \
4789
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
4790
+ for p in $$list; do \
4791
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
4792
- f=$(am__strip_dir) \
4793
- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
4794
- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
4796
+ done | $(am__base_list) | \
4797
+ while read files; do \
4798
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
4799
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
4803
@$(NORMAL_UNINSTALL)
4804
- @list='$(icon_DATA)'; for p in $$list; do \
4805
- f=$(am__strip_dir) \
4806
- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
4807
- rm -f "$(DESTDIR)$(icondir)/$$f"; \
4809
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
4810
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
4811
+ test -n "$$files" || exit 0; \
4812
+ echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
4813
+ cd "$(DESTDIR)$(icondir)" && rm -f $$files
4817
@@ -298,13 +320,17 @@
4818
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
4819
if test -d $$d/$$file; then \
4820
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
4821
+ if test -d "$(distdir)/$$file"; then \
4822
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
4824
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
4825
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
4826
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
4827
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
4829
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
4830
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
4832
- test -f $(distdir)/$$file \
4833
- || cp -p $$d/$$file $(distdir)/$$file \
4834
+ test -f "$(distdir)/$$file" \
4835
+ || cp -p $$d/$$file "$(distdir)/$$file" \
4842
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
4843
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
4845
maintainer-clean-generic:
4846
@echo "This command is intended for maintainers to use"
4856
@@ -361,18 +390,28 @@
4858
install-dvi: install-dvi-am
4864
install-html: install-html-am
4868
install-info: install-info-am
4874
install-pdf: install-pdf-am
4878
install-ps: install-ps-am
4884
maintainer-clean: maintainer-clean-am
4886
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
4887
uninstall-am uninstall-iconDATA
4890
# Tell versions [3.59,3.63) of GNU make to not export all variables.
4891
# Otherwise a system limit (for SysV at least) may be exceeded.
4893
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/16x16/stock/net/Makefile.in gnome-icon-theme-2.27.90.new/16x16/stock/net/Makefile.in
4894
--- gnome-icon-theme-2.27.90/16x16/stock/net/Makefile.in 2009-08-13 03:45:38.000000000 +0200
4895
+++ gnome-icon-theme-2.27.90.new/16x16/stock/net/Makefile.in 2009-08-27 12:38:26.000000000 +0200
4897
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
4898
+# Makefile.in generated by automake 1.11 from Makefile.am.
4901
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4902
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
4903
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
4905
# This Makefile.in is free software; the Free Software Foundation
4906
# gives unlimited permission to copy and/or distribute it,
4907
# with or without modifications, as long as this notice is preserved.
4911
pkgdatadir = $(datadir)/@PACKAGE@
4912
-pkglibdir = $(libdir)/@PACKAGE@
4913
pkgincludedir = $(includedir)/@PACKAGE@
4914
+pkglibdir = $(libdir)/@PACKAGE@
4915
+pkglibexecdir = $(libexecdir)/@PACKAGE@
4916
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
4917
install_sh_DATA = $(install_sh) -c -m 644
4918
install_sh_PROGRAM = $(install_sh) -c
4921
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
4922
CONFIG_CLEAN_FILES =
4923
+CONFIG_CLEAN_VPATH_FILES =
4926
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
4928
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
4931
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
4932
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
4933
+am__install_max = 40
4934
+am__nobase_strip_setup = \
4935
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
4936
+am__nobase_strip = \
4937
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
4938
+am__nobase_list = $(am__nobase_strip_setup); \
4939
+ for p in $$list; do echo "$$p $$p"; done | \
4940
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
4941
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
4942
+ if (++n[$$2] == $(am__install_max)) \
4943
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
4944
+ END { for (dir in files) print dir, files[dir] }'
4946
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
4947
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
4948
am__installdirs = "$(DESTDIR)$(icondir)"
4949
-iconDATA_INSTALL = $(INSTALL_DATA)
4951
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
4954
PACKAGE_NAME = @PACKAGE_NAME@
4955
PACKAGE_STRING = @PACKAGE_STRING@
4956
PACKAGE_TARNAME = @PACKAGE_TARNAME@
4957
+PACKAGE_URL = @PACKAGE_URL@
4958
PACKAGE_VERSION = @PACKAGE_VERSION@
4959
PATH_SEPARATOR = @PATH_SEPARATOR@
4960
PKG_CONFIG = @PKG_CONFIG@
4965
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/stock/net/Makefile'; \
4966
- cd $(top_srcdir) && \
4967
- $(AUTOMAKE) --gnu 16x16/stock/net/Makefile
4968
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/stock/net/Makefile'; \
4969
+ $(am__cd) $(top_srcdir) && \
4970
+ $(AUTOMAKE) --gnu 16x16/stock/net/Makefile
4972
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
4974
@@ -250,23 +268,27 @@
4975
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
4976
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
4977
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
4978
+$(am__aclocal_m4_deps):
4979
install-iconDATA: $(icon_DATA)
4981
test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
4982
- @list='$(icon_DATA)'; for p in $$list; do \
4983
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
4984
+ for p in $$list; do \
4985
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
4986
- f=$(am__strip_dir) \
4987
- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
4988
- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
4990
+ done | $(am__base_list) | \
4991
+ while read files; do \
4992
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
4993
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
4997
@$(NORMAL_UNINSTALL)
4998
- @list='$(icon_DATA)'; for p in $$list; do \
4999
- f=$(am__strip_dir) \
5000
- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
5001
- rm -f "$(DESTDIR)$(icondir)/$$f"; \
5003
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
5004
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
5005
+ test -n "$$files" || exit 0; \
5006
+ echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
5007
+ cd "$(DESTDIR)$(icondir)" && rm -f $$files
5011
@@ -290,13 +312,17 @@
5012
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
5013
if test -d $$d/$$file; then \
5014
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
5015
+ if test -d "$(distdir)/$$file"; then \
5016
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
5018
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
5019
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
5020
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
5021
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
5023
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
5024
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
5026
- test -f $(distdir)/$$file \
5027
- || cp -p $$d/$$file $(distdir)/$$file \
5028
+ test -f "$(distdir)/$$file" \
5029
+ || cp -p $$d/$$file "$(distdir)/$$file" \
5036
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
5037
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
5039
maintainer-clean-generic:
5040
@echo "This command is intended for maintainers to use"
5050
@@ -353,18 +382,28 @@
5052
install-dvi: install-dvi-am
5058
install-html: install-html-am
5062
install-info: install-info-am
5068
install-pdf: install-pdf-am
5072
install-ps: install-ps-am
5078
maintainer-clean: maintainer-clean-am
5080
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
5081
uninstall-am uninstall-iconDATA
5084
# Tell versions [3.59,3.63) of GNU make to not export all variables.
5085
# Otherwise a system limit (for SysV at least) may be exceeded.
5087
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/16x16/stock/object/Makefile.in gnome-icon-theme-2.27.90.new/16x16/stock/object/Makefile.in
5088
--- gnome-icon-theme-2.27.90/16x16/stock/object/Makefile.in 2009-08-13 03:45:39.000000000 +0200
5089
+++ gnome-icon-theme-2.27.90.new/16x16/stock/object/Makefile.in 2009-08-27 12:38:26.000000000 +0200
5091
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
5092
+# Makefile.in generated by automake 1.11 from Makefile.am.
5095
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5096
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
5097
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
5099
# This Makefile.in is free software; the Free Software Foundation
5100
# gives unlimited permission to copy and/or distribute it,
5101
# with or without modifications, as long as this notice is preserved.
5105
pkgdatadir = $(datadir)/@PACKAGE@
5106
-pkglibdir = $(libdir)/@PACKAGE@
5107
pkgincludedir = $(includedir)/@PACKAGE@
5108
+pkglibdir = $(libdir)/@PACKAGE@
5109
+pkglibexecdir = $(libexecdir)/@PACKAGE@
5110
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
5111
install_sh_DATA = $(install_sh) -c -m 644
5112
install_sh_PROGRAM = $(install_sh) -c
5115
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
5116
CONFIG_CLEAN_FILES =
5117
+CONFIG_CLEAN_VPATH_FILES =
5120
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
5122
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
5125
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
5126
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
5127
+am__install_max = 40
5128
+am__nobase_strip_setup = \
5129
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
5130
+am__nobase_strip = \
5131
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
5132
+am__nobase_list = $(am__nobase_strip_setup); \
5133
+ for p in $$list; do echo "$$p $$p"; done | \
5134
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
5135
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
5136
+ if (++n[$$2] == $(am__install_max)) \
5137
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
5138
+ END { for (dir in files) print dir, files[dir] }'
5140
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
5141
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
5142
am__installdirs = "$(DESTDIR)$(icondir)"
5143
-iconDATA_INSTALL = $(INSTALL_DATA)
5145
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
5148
PACKAGE_NAME = @PACKAGE_NAME@
5149
PACKAGE_STRING = @PACKAGE_STRING@
5150
PACKAGE_TARNAME = @PACKAGE_TARNAME@
5151
+PACKAGE_URL = @PACKAGE_URL@
5152
PACKAGE_VERSION = @PACKAGE_VERSION@
5153
PATH_SEPARATOR = @PATH_SEPARATOR@
5154
PKG_CONFIG = @PKG_CONFIG@
5159
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/stock/object/Makefile'; \
5160
- cd $(top_srcdir) && \
5161
- $(AUTOMAKE) --gnu 16x16/stock/object/Makefile
5162
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/stock/object/Makefile'; \
5163
+ $(am__cd) $(top_srcdir) && \
5164
+ $(AUTOMAKE) --gnu 16x16/stock/object/Makefile
5166
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
5168
@@ -289,23 +307,27 @@
5169
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
5170
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
5171
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
5172
+$(am__aclocal_m4_deps):
5173
install-iconDATA: $(icon_DATA)
5175
test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
5176
- @list='$(icon_DATA)'; for p in $$list; do \
5177
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
5178
+ for p in $$list; do \
5179
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
5180
- f=$(am__strip_dir) \
5181
- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
5182
- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
5184
+ done | $(am__base_list) | \
5185
+ while read files; do \
5186
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
5187
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
5191
@$(NORMAL_UNINSTALL)
5192
- @list='$(icon_DATA)'; for p in $$list; do \
5193
- f=$(am__strip_dir) \
5194
- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
5195
- rm -f "$(DESTDIR)$(icondir)/$$f"; \
5197
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
5198
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
5199
+ test -n "$$files" || exit 0; \
5200
+ echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
5201
+ cd "$(DESTDIR)$(icondir)" && rm -f $$files
5205
@@ -329,13 +351,17 @@
5206
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
5207
if test -d $$d/$$file; then \
5208
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
5209
+ if test -d "$(distdir)/$$file"; then \
5210
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
5212
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
5213
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
5214
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
5215
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
5217
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
5218
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
5220
- test -f $(distdir)/$$file \
5221
- || cp -p $$d/$$file $(distdir)/$$file \
5222
+ test -f "$(distdir)/$$file" \
5223
+ || cp -p $$d/$$file "$(distdir)/$$file" \
5230
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
5231
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
5233
maintainer-clean-generic:
5234
@echo "This command is intended for maintainers to use"
5244
@@ -392,18 +421,28 @@
5246
install-dvi: install-dvi-am
5252
install-html: install-html-am
5256
install-info: install-info-am
5262
install-pdf: install-pdf-am
5266
install-ps: install-ps-am
5272
maintainer-clean: maintainer-clean-am
5274
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
5275
uninstall-am uninstall-iconDATA
5278
# Tell versions [3.59,3.63) of GNU make to not export all variables.
5279
# Otherwise a system limit (for SysV at least) may be exceeded.
5281
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/16x16/stock/table/Makefile.in gnome-icon-theme-2.27.90.new/16x16/stock/table/Makefile.in
5282
--- gnome-icon-theme-2.27.90/16x16/stock/table/Makefile.in 2009-08-13 03:45:39.000000000 +0200
5283
+++ gnome-icon-theme-2.27.90.new/16x16/stock/table/Makefile.in 2009-08-27 12:38:26.000000000 +0200
5285
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
5286
+# Makefile.in generated by automake 1.11 from Makefile.am.
5289
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5290
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
5291
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
5293
# This Makefile.in is free software; the Free Software Foundation
5294
# gives unlimited permission to copy and/or distribute it,
5295
# with or without modifications, as long as this notice is preserved.
5299
pkgdatadir = $(datadir)/@PACKAGE@
5300
-pkglibdir = $(libdir)/@PACKAGE@
5301
pkgincludedir = $(includedir)/@PACKAGE@
5302
+pkglibdir = $(libdir)/@PACKAGE@
5303
+pkglibexecdir = $(libexecdir)/@PACKAGE@
5304
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
5305
install_sh_DATA = $(install_sh) -c -m 644
5306
install_sh_PROGRAM = $(install_sh) -c
5309
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
5310
CONFIG_CLEAN_FILES =
5311
+CONFIG_CLEAN_VPATH_FILES =
5314
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
5316
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
5319
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
5320
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
5321
+am__install_max = 40
5322
+am__nobase_strip_setup = \
5323
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
5324
+am__nobase_strip = \
5325
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
5326
+am__nobase_list = $(am__nobase_strip_setup); \
5327
+ for p in $$list; do echo "$$p $$p"; done | \
5328
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
5329
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
5330
+ if (++n[$$2] == $(am__install_max)) \
5331
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
5332
+ END { for (dir in files) print dir, files[dir] }'
5334
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
5335
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
5336
am__installdirs = "$(DESTDIR)$(icondir)"
5337
-iconDATA_INSTALL = $(INSTALL_DATA)
5339
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
5342
PACKAGE_NAME = @PACKAGE_NAME@
5343
PACKAGE_STRING = @PACKAGE_STRING@
5344
PACKAGE_TARNAME = @PACKAGE_TARNAME@
5345
+PACKAGE_URL = @PACKAGE_URL@
5346
PACKAGE_VERSION = @PACKAGE_VERSION@
5347
PATH_SEPARATOR = @PATH_SEPARATOR@
5348
PKG_CONFIG = @PKG_CONFIG@
5353
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/stock/table/Makefile'; \
5354
- cd $(top_srcdir) && \
5355
- $(AUTOMAKE) --gnu 16x16/stock/table/Makefile
5356
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/stock/table/Makefile'; \
5357
+ $(am__cd) $(top_srcdir) && \
5358
+ $(AUTOMAKE) --gnu 16x16/stock/table/Makefile
5360
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
5362
@@ -252,23 +270,27 @@
5363
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
5364
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
5365
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
5366
+$(am__aclocal_m4_deps):
5367
install-iconDATA: $(icon_DATA)
5369
test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
5370
- @list='$(icon_DATA)'; for p in $$list; do \
5371
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
5372
+ for p in $$list; do \
5373
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
5374
- f=$(am__strip_dir) \
5375
- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
5376
- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
5378
+ done | $(am__base_list) | \
5379
+ while read files; do \
5380
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
5381
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
5385
@$(NORMAL_UNINSTALL)
5386
- @list='$(icon_DATA)'; for p in $$list; do \
5387
- f=$(am__strip_dir) \
5388
- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
5389
- rm -f "$(DESTDIR)$(icondir)/$$f"; \
5391
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
5392
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
5393
+ test -n "$$files" || exit 0; \
5394
+ echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
5395
+ cd "$(DESTDIR)$(icondir)" && rm -f $$files
5399
@@ -292,13 +314,17 @@
5400
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
5401
if test -d $$d/$$file; then \
5402
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
5403
+ if test -d "$(distdir)/$$file"; then \
5404
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
5406
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
5407
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
5408
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
5409
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
5411
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
5412
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
5414
- test -f $(distdir)/$$file \
5415
- || cp -p $$d/$$file $(distdir)/$$file \
5416
+ test -f "$(distdir)/$$file" \
5417
+ || cp -p $$d/$$file "$(distdir)/$$file" \
5424
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
5425
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
5427
maintainer-clean-generic:
5428
@echo "This command is intended for maintainers to use"
5438
@@ -355,18 +384,28 @@
5440
install-dvi: install-dvi-am
5446
install-html: install-html-am
5450
install-info: install-info-am
5456
install-pdf: install-pdf-am
5460
install-ps: install-ps-am
5466
maintainer-clean: maintainer-clean-am
5468
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
5469
uninstall-am uninstall-iconDATA
5472
# Tell versions [3.59,3.63) of GNU make to not export all variables.
5473
# Otherwise a system limit (for SysV at least) may be exceeded.
5475
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/16x16/stock/text/Makefile.in gnome-icon-theme-2.27.90.new/16x16/stock/text/Makefile.in
5476
--- gnome-icon-theme-2.27.90/16x16/stock/text/Makefile.in 2009-08-13 03:45:39.000000000 +0200
5477
+++ gnome-icon-theme-2.27.90.new/16x16/stock/text/Makefile.in 2009-08-27 12:38:26.000000000 +0200
5479
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
5480
+# Makefile.in generated by automake 1.11 from Makefile.am.
5483
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5484
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
5485
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
5487
# This Makefile.in is free software; the Free Software Foundation
5488
# gives unlimited permission to copy and/or distribute it,
5489
# with or without modifications, as long as this notice is preserved.
5493
pkgdatadir = $(datadir)/@PACKAGE@
5494
-pkglibdir = $(libdir)/@PACKAGE@
5495
pkgincludedir = $(includedir)/@PACKAGE@
5496
+pkglibdir = $(libdir)/@PACKAGE@
5497
+pkglibexecdir = $(libexecdir)/@PACKAGE@
5498
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
5499
install_sh_DATA = $(install_sh) -c -m 644
5500
install_sh_PROGRAM = $(install_sh) -c
5503
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
5504
CONFIG_CLEAN_FILES =
5505
+CONFIG_CLEAN_VPATH_FILES =
5508
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
5510
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
5513
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
5514
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
5515
+am__install_max = 40
5516
+am__nobase_strip_setup = \
5517
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
5518
+am__nobase_strip = \
5519
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
5520
+am__nobase_list = $(am__nobase_strip_setup); \
5521
+ for p in $$list; do echo "$$p $$p"; done | \
5522
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
5523
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
5524
+ if (++n[$$2] == $(am__install_max)) \
5525
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
5526
+ END { for (dir in files) print dir, files[dir] }'
5528
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
5529
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
5530
am__installdirs = "$(DESTDIR)$(icondir)"
5531
-iconDATA_INSTALL = $(INSTALL_DATA)
5533
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
5536
PACKAGE_NAME = @PACKAGE_NAME@
5537
PACKAGE_STRING = @PACKAGE_STRING@
5538
PACKAGE_TARNAME = @PACKAGE_TARNAME@
5539
+PACKAGE_URL = @PACKAGE_URL@
5540
PACKAGE_VERSION = @PACKAGE_VERSION@
5541
PATH_SEPARATOR = @PATH_SEPARATOR@
5542
PKG_CONFIG = @PKG_CONFIG@
5547
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/stock/text/Makefile'; \
5548
- cd $(top_srcdir) && \
5549
- $(AUTOMAKE) --gnu 16x16/stock/text/Makefile
5550
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 16x16/stock/text/Makefile'; \
5551
+ $(am__cd) $(top_srcdir) && \
5552
+ $(AUTOMAKE) --gnu 16x16/stock/text/Makefile
5554
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
5556
@@ -305,23 +323,27 @@
5557
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
5558
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
5559
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
5560
+$(am__aclocal_m4_deps):
5561
install-iconDATA: $(icon_DATA)
5563
test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
5564
- @list='$(icon_DATA)'; for p in $$list; do \
5565
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
5566
+ for p in $$list; do \
5567
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
5568
- f=$(am__strip_dir) \
5569
- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
5570
- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
5572
+ done | $(am__base_list) | \
5573
+ while read files; do \
5574
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
5575
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
5579
@$(NORMAL_UNINSTALL)
5580
- @list='$(icon_DATA)'; for p in $$list; do \
5581
- f=$(am__strip_dir) \
5582
- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
5583
- rm -f "$(DESTDIR)$(icondir)/$$f"; \
5585
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
5586
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
5587
+ test -n "$$files" || exit 0; \
5588
+ echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
5589
+ cd "$(DESTDIR)$(icondir)" && rm -f $$files
5593
@@ -345,13 +367,17 @@
5594
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
5595
if test -d $$d/$$file; then \
5596
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
5597
+ if test -d "$(distdir)/$$file"; then \
5598
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
5600
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
5601
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
5602
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
5603
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
5605
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
5606
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
5608
- test -f $(distdir)/$$file \
5609
- || cp -p $$d/$$file $(distdir)/$$file \
5610
+ test -f "$(distdir)/$$file" \
5611
+ || cp -p $$d/$$file "$(distdir)/$$file" \
5618
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
5619
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
5621
maintainer-clean-generic:
5622
@echo "This command is intended for maintainers to use"
5632
@@ -408,18 +437,28 @@
5634
install-dvi: install-dvi-am
5640
install-html: install-html-am
5644
install-info: install-info-am
5650
install-pdf: install-pdf-am
5654
install-ps: install-ps-am
5660
maintainer-clean: maintainer-clean-am
5662
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
5663
uninstall-am uninstall-iconDATA
5666
# Tell versions [3.59,3.63) of GNU make to not export all variables.
5667
# Otherwise a system limit (for SysV at least) may be exceeded.
5669
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/22x22/actions/Makefile.in gnome-icon-theme-2.27.90.new/22x22/actions/Makefile.in
5670
--- gnome-icon-theme-2.27.90/22x22/actions/Makefile.in 2009-08-13 03:45:39.000000000 +0200
5671
+++ gnome-icon-theme-2.27.90.new/22x22/actions/Makefile.in 2009-08-27 12:38:26.000000000 +0200
5673
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
5674
+# Makefile.in generated by automake 1.11 from Makefile.am.
5677
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5678
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
5679
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
5681
# This Makefile.in is free software; the Free Software Foundation
5682
# gives unlimited permission to copy and/or distribute it,
5683
# with or without modifications, as long as this notice is preserved.
5687
pkgdatadir = $(datadir)/@PACKAGE@
5688
-pkglibdir = $(libdir)/@PACKAGE@
5689
pkgincludedir = $(includedir)/@PACKAGE@
5690
+pkglibdir = $(libdir)/@PACKAGE@
5691
+pkglibexecdir = $(libexecdir)/@PACKAGE@
5692
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
5693
install_sh_DATA = $(install_sh) -c -m 644
5694
install_sh_PROGRAM = $(install_sh) -c
5697
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
5698
CONFIG_CLEAN_FILES =
5699
+CONFIG_CLEAN_VPATH_FILES =
5702
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
5704
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
5707
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
5708
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
5709
+am__install_max = 40
5710
+am__nobase_strip_setup = \
5711
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
5712
+am__nobase_strip = \
5713
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
5714
+am__nobase_list = $(am__nobase_strip_setup); \
5715
+ for p in $$list; do echo "$$p $$p"; done | \
5716
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
5717
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
5718
+ if (++n[$$2] == $(am__install_max)) \
5719
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
5720
+ END { for (dir in files) print dir, files[dir] }'
5722
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
5723
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
5724
am__installdirs = "$(DESTDIR)$(iconsdir)"
5725
-iconsDATA_INSTALL = $(INSTALL_DATA)
5726
DATA = $(icons_DATA)
5727
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
5730
PACKAGE_NAME = @PACKAGE_NAME@
5731
PACKAGE_STRING = @PACKAGE_STRING@
5732
PACKAGE_TARNAME = @PACKAGE_TARNAME@
5733
+PACKAGE_URL = @PACKAGE_URL@
5734
PACKAGE_VERSION = @PACKAGE_VERSION@
5735
PATH_SEPARATOR = @PATH_SEPARATOR@
5736
PKG_CONFIG = @PKG_CONFIG@
5741
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 22x22/actions/Makefile'; \
5742
- cd $(top_srcdir) && \
5743
- $(AUTOMAKE) --gnu 22x22/actions/Makefile
5744
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 22x22/actions/Makefile'; \
5745
+ $(am__cd) $(top_srcdir) && \
5746
+ $(AUTOMAKE) --gnu 22x22/actions/Makefile
5748
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
5750
@@ -309,23 +327,27 @@
5751
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
5752
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
5753
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
5754
+$(am__aclocal_m4_deps):
5755
install-iconsDATA: $(icons_DATA)
5757
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
5758
- @list='$(icons_DATA)'; for p in $$list; do \
5759
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
5760
+ for p in $$list; do \
5761
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
5762
- f=$(am__strip_dir) \
5763
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
5764
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
5766
+ done | $(am__base_list) | \
5767
+ while read files; do \
5768
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
5769
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
5772
uninstall-iconsDATA:
5773
@$(NORMAL_UNINSTALL)
5774
- @list='$(icons_DATA)'; for p in $$list; do \
5775
- f=$(am__strip_dir) \
5776
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
5777
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
5779
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
5780
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
5781
+ test -n "$$files" || exit 0; \
5782
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
5783
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
5787
@@ -349,13 +371,17 @@
5788
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
5789
if test -d $$d/$$file; then \
5790
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
5791
+ if test -d "$(distdir)/$$file"; then \
5792
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
5794
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
5795
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
5796
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
5797
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
5799
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
5800
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
5802
- test -f $(distdir)/$$file \
5803
- || cp -p $$d/$$file $(distdir)/$$file \
5804
+ test -f "$(distdir)/$$file" \
5805
+ || cp -p $$d/$$file "$(distdir)/$$file" \
5812
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
5813
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
5815
maintainer-clean-generic:
5816
@echo "This command is intended for maintainers to use"
5826
@@ -413,18 +442,28 @@
5828
install-dvi: install-dvi-am
5834
install-html: install-html-am
5838
install-info: install-info-am
5844
install-pdf: install-pdf-am
5848
install-ps: install-ps-am
5854
maintainer-clean: maintainer-clean-am
5860
# Tell versions [3.59,3.63) of GNU make to not export all variables.
5861
# Otherwise a system limit (for SysV at least) may be exceeded.
5863
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/22x22/animations/Makefile.in gnome-icon-theme-2.27.90.new/22x22/animations/Makefile.in
5864
--- gnome-icon-theme-2.27.90/22x22/animations/Makefile.in 2009-08-13 03:45:40.000000000 +0200
5865
+++ gnome-icon-theme-2.27.90.new/22x22/animations/Makefile.in 2009-08-27 12:38:26.000000000 +0200
5867
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
5868
+# Makefile.in generated by automake 1.11 from Makefile.am.
5871
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5872
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
5873
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
5875
# This Makefile.in is free software; the Free Software Foundation
5876
# gives unlimited permission to copy and/or distribute it,
5877
# with or without modifications, as long as this notice is preserved.
5881
pkgdatadir = $(datadir)/@PACKAGE@
5882
-pkglibdir = $(libdir)/@PACKAGE@
5883
pkgincludedir = $(includedir)/@PACKAGE@
5884
+pkglibdir = $(libdir)/@PACKAGE@
5885
+pkglibexecdir = $(libexecdir)/@PACKAGE@
5886
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
5887
install_sh_DATA = $(install_sh) -c -m 644
5888
install_sh_PROGRAM = $(install_sh) -c
5891
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
5892
CONFIG_CLEAN_FILES =
5893
+CONFIG_CLEAN_VPATH_FILES =
5896
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
5898
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
5901
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
5902
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
5903
+am__install_max = 40
5904
+am__nobase_strip_setup = \
5905
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
5906
+am__nobase_strip = \
5907
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
5908
+am__nobase_list = $(am__nobase_strip_setup); \
5909
+ for p in $$list; do echo "$$p $$p"; done | \
5910
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
5911
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
5912
+ if (++n[$$2] == $(am__install_max)) \
5913
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
5914
+ END { for (dir in files) print dir, files[dir] }'
5916
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
5917
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
5918
am__installdirs = "$(DESTDIR)$(iconsdir)"
5919
-iconsDATA_INSTALL = $(INSTALL_DATA)
5920
DATA = $(icons_DATA)
5921
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
5924
PACKAGE_NAME = @PACKAGE_NAME@
5925
PACKAGE_STRING = @PACKAGE_STRING@
5926
PACKAGE_TARNAME = @PACKAGE_TARNAME@
5927
+PACKAGE_URL = @PACKAGE_URL@
5928
PACKAGE_VERSION = @PACKAGE_VERSION@
5929
PATH_SEPARATOR = @PATH_SEPARATOR@
5930
PKG_CONFIG = @PKG_CONFIG@
5935
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 22x22/animations/Makefile'; \
5936
- cd $(top_srcdir) && \
5937
- $(AUTOMAKE) --gnu 22x22/animations/Makefile
5938
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 22x22/animations/Makefile'; \
5939
+ $(am__cd) $(top_srcdir) && \
5940
+ $(AUTOMAKE) --gnu 22x22/animations/Makefile
5942
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
5944
@@ -206,23 +224,27 @@
5945
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
5946
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
5947
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
5948
+$(am__aclocal_m4_deps):
5949
install-iconsDATA: $(icons_DATA)
5951
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
5952
- @list='$(icons_DATA)'; for p in $$list; do \
5953
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
5954
+ for p in $$list; do \
5955
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
5956
- f=$(am__strip_dir) \
5957
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
5958
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
5960
+ done | $(am__base_list) | \
5961
+ while read files; do \
5962
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
5963
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
5966
uninstall-iconsDATA:
5967
@$(NORMAL_UNINSTALL)
5968
- @list='$(icons_DATA)'; for p in $$list; do \
5969
- f=$(am__strip_dir) \
5970
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
5971
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
5973
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
5974
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
5975
+ test -n "$$files" || exit 0; \
5976
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
5977
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
5981
@@ -246,13 +268,17 @@
5982
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
5983
if test -d $$d/$$file; then \
5984
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
5985
+ if test -d "$(distdir)/$$file"; then \
5986
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
5988
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
5989
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
5990
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
5991
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
5993
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
5994
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
5996
- test -f $(distdir)/$$file \
5997
- || cp -p $$d/$$file $(distdir)/$$file \
5998
+ test -f "$(distdir)/$$file" \
5999
+ || cp -p $$d/$$file "$(distdir)/$$file" \
6006
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
6007
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
6009
maintainer-clean-generic:
6010
@echo "This command is intended for maintainers to use"
6020
@@ -310,18 +339,28 @@
6022
install-dvi: install-dvi-am
6028
install-html: install-html-am
6032
install-info: install-info-am
6038
install-pdf: install-pdf-am
6042
install-ps: install-ps-am
6048
maintainer-clean: maintainer-clean-am
6054
# Tell versions [3.59,3.63) of GNU make to not export all variables.
6055
# Otherwise a system limit (for SysV at least) may be exceeded.
6057
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/22x22/apps/Makefile.in gnome-icon-theme-2.27.90.new/22x22/apps/Makefile.in
6058
--- gnome-icon-theme-2.27.90/22x22/apps/Makefile.in 2009-08-13 03:45:40.000000000 +0200
6059
+++ gnome-icon-theme-2.27.90.new/22x22/apps/Makefile.in 2009-08-27 12:38:26.000000000 +0200
6061
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
6062
+# Makefile.in generated by automake 1.11 from Makefile.am.
6065
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
6066
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
6067
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
6069
# This Makefile.in is free software; the Free Software Foundation
6070
# gives unlimited permission to copy and/or distribute it,
6071
# with or without modifications, as long as this notice is preserved.
6075
pkgdatadir = $(datadir)/@PACKAGE@
6076
-pkglibdir = $(libdir)/@PACKAGE@
6077
pkgincludedir = $(includedir)/@PACKAGE@
6078
+pkglibdir = $(libdir)/@PACKAGE@
6079
+pkglibexecdir = $(libexecdir)/@PACKAGE@
6080
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
6081
install_sh_DATA = $(install_sh) -c -m 644
6082
install_sh_PROGRAM = $(install_sh) -c
6085
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
6086
CONFIG_CLEAN_FILES =
6087
+CONFIG_CLEAN_VPATH_FILES =
6090
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
6092
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
6095
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
6096
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
6097
+am__install_max = 40
6098
+am__nobase_strip_setup = \
6099
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
6100
+am__nobase_strip = \
6101
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
6102
+am__nobase_list = $(am__nobase_strip_setup); \
6103
+ for p in $$list; do echo "$$p $$p"; done | \
6104
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
6105
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
6106
+ if (++n[$$2] == $(am__install_max)) \
6107
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
6108
+ END { for (dir in files) print dir, files[dir] }'
6110
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
6111
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
6112
am__installdirs = "$(DESTDIR)$(iconsdir)"
6113
-iconsDATA_INSTALL = $(INSTALL_DATA)
6114
DATA = $(icons_DATA)
6115
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
6118
PACKAGE_NAME = @PACKAGE_NAME@
6119
PACKAGE_STRING = @PACKAGE_STRING@
6120
PACKAGE_TARNAME = @PACKAGE_TARNAME@
6121
+PACKAGE_URL = @PACKAGE_URL@
6122
PACKAGE_VERSION = @PACKAGE_VERSION@
6123
PATH_SEPARATOR = @PATH_SEPARATOR@
6124
PKG_CONFIG = @PKG_CONFIG@
6129
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 22x22/apps/Makefile'; \
6130
- cd $(top_srcdir) && \
6131
- $(AUTOMAKE) --gnu 22x22/apps/Makefile
6132
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 22x22/apps/Makefile'; \
6133
+ $(am__cd) $(top_srcdir) && \
6134
+ $(AUTOMAKE) --gnu 22x22/apps/Makefile
6136
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
6138
@@ -237,23 +255,27 @@
6139
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
6140
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
6141
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
6142
+$(am__aclocal_m4_deps):
6143
install-iconsDATA: $(icons_DATA)
6145
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
6146
- @list='$(icons_DATA)'; for p in $$list; do \
6147
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
6148
+ for p in $$list; do \
6149
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
6150
- f=$(am__strip_dir) \
6151
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
6152
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
6154
+ done | $(am__base_list) | \
6155
+ while read files; do \
6156
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
6157
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
6160
uninstall-iconsDATA:
6161
@$(NORMAL_UNINSTALL)
6162
- @list='$(icons_DATA)'; for p in $$list; do \
6163
- f=$(am__strip_dir) \
6164
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
6165
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
6167
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
6168
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
6169
+ test -n "$$files" || exit 0; \
6170
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
6171
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
6175
@@ -277,13 +299,17 @@
6176
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
6177
if test -d $$d/$$file; then \
6178
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
6179
+ if test -d "$(distdir)/$$file"; then \
6180
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
6182
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
6183
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
6184
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
6185
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
6187
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
6188
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
6190
- test -f $(distdir)/$$file \
6191
- || cp -p $$d/$$file $(distdir)/$$file \
6192
+ test -f "$(distdir)/$$file" \
6193
+ || cp -p $$d/$$file "$(distdir)/$$file" \
6200
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
6201
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
6203
maintainer-clean-generic:
6204
@echo "This command is intended for maintainers to use"
6214
@@ -341,18 +370,28 @@
6216
install-dvi: install-dvi-am
6222
install-html: install-html-am
6226
install-info: install-info-am
6232
install-pdf: install-pdf-am
6236
install-ps: install-ps-am
6242
maintainer-clean: maintainer-clean-am
6248
# Tell versions [3.59,3.63) of GNU make to not export all variables.
6249
# Otherwise a system limit (for SysV at least) may be exceeded.
6251
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/22x22/categories/Makefile.in gnome-icon-theme-2.27.90.new/22x22/categories/Makefile.in
6252
--- gnome-icon-theme-2.27.90/22x22/categories/Makefile.in 2009-08-13 03:45:40.000000000 +0200
6253
+++ gnome-icon-theme-2.27.90.new/22x22/categories/Makefile.in 2009-08-27 12:38:26.000000000 +0200
6255
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
6256
+# Makefile.in generated by automake 1.11 from Makefile.am.
6259
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
6260
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
6261
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
6263
# This Makefile.in is free software; the Free Software Foundation
6264
# gives unlimited permission to copy and/or distribute it,
6265
# with or without modifications, as long as this notice is preserved.
6269
pkgdatadir = $(datadir)/@PACKAGE@
6270
-pkglibdir = $(libdir)/@PACKAGE@
6271
pkgincludedir = $(includedir)/@PACKAGE@
6272
+pkglibdir = $(libdir)/@PACKAGE@
6273
+pkglibexecdir = $(libexecdir)/@PACKAGE@
6274
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
6275
install_sh_DATA = $(install_sh) -c -m 644
6276
install_sh_PROGRAM = $(install_sh) -c
6279
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
6280
CONFIG_CLEAN_FILES =
6281
+CONFIG_CLEAN_VPATH_FILES =
6284
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
6286
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
6289
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
6290
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
6291
+am__install_max = 40
6292
+am__nobase_strip_setup = \
6293
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
6294
+am__nobase_strip = \
6295
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
6296
+am__nobase_list = $(am__nobase_strip_setup); \
6297
+ for p in $$list; do echo "$$p $$p"; done | \
6298
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
6299
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
6300
+ if (++n[$$2] == $(am__install_max)) \
6301
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
6302
+ END { for (dir in files) print dir, files[dir] }'
6304
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
6305
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
6306
am__installdirs = "$(DESTDIR)$(iconsdir)"
6307
-iconsDATA_INSTALL = $(INSTALL_DATA)
6308
DATA = $(icons_DATA)
6309
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
6312
PACKAGE_NAME = @PACKAGE_NAME@
6313
PACKAGE_STRING = @PACKAGE_STRING@
6314
PACKAGE_TARNAME = @PACKAGE_TARNAME@
6315
+PACKAGE_URL = @PACKAGE_URL@
6316
PACKAGE_VERSION = @PACKAGE_VERSION@
6317
PATH_SEPARATOR = @PATH_SEPARATOR@
6318
PKG_CONFIG = @PKG_CONFIG@
6323
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 22x22/categories/Makefile'; \
6324
- cd $(top_srcdir) && \
6325
- $(AUTOMAKE) --gnu 22x22/categories/Makefile
6326
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 22x22/categories/Makefile'; \
6327
+ $(am__cd) $(top_srcdir) && \
6328
+ $(AUTOMAKE) --gnu 22x22/categories/Makefile
6330
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
6332
@@ -224,23 +242,27 @@
6333
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
6334
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
6335
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
6336
+$(am__aclocal_m4_deps):
6337
install-iconsDATA: $(icons_DATA)
6339
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
6340
- @list='$(icons_DATA)'; for p in $$list; do \
6341
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
6342
+ for p in $$list; do \
6343
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
6344
- f=$(am__strip_dir) \
6345
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
6346
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
6348
+ done | $(am__base_list) | \
6349
+ while read files; do \
6350
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
6351
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
6354
uninstall-iconsDATA:
6355
@$(NORMAL_UNINSTALL)
6356
- @list='$(icons_DATA)'; for p in $$list; do \
6357
- f=$(am__strip_dir) \
6358
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
6359
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
6361
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
6362
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
6363
+ test -n "$$files" || exit 0; \
6364
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
6365
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
6369
@@ -264,13 +286,17 @@
6370
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
6371
if test -d $$d/$$file; then \
6372
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
6373
+ if test -d "$(distdir)/$$file"; then \
6374
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
6376
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
6377
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
6378
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
6379
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
6381
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
6382
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
6384
- test -f $(distdir)/$$file \
6385
- || cp -p $$d/$$file $(distdir)/$$file \
6386
+ test -f "$(distdir)/$$file" \
6387
+ || cp -p $$d/$$file "$(distdir)/$$file" \
6394
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
6395
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
6397
maintainer-clean-generic:
6398
@echo "This command is intended for maintainers to use"
6408
@@ -328,18 +357,28 @@
6410
install-dvi: install-dvi-am
6416
install-html: install-html-am
6420
install-info: install-info-am
6426
install-pdf: install-pdf-am
6430
install-ps: install-ps-am
6436
maintainer-clean: maintainer-clean-am
6442
# Tell versions [3.59,3.63) of GNU make to not export all variables.
6443
# Otherwise a system limit (for SysV at least) may be exceeded.
6445
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/22x22/devices/Makefile.in gnome-icon-theme-2.27.90.new/22x22/devices/Makefile.in
6446
--- gnome-icon-theme-2.27.90/22x22/devices/Makefile.in 2009-08-13 03:45:40.000000000 +0200
6447
+++ gnome-icon-theme-2.27.90.new/22x22/devices/Makefile.in 2009-08-27 12:38:27.000000000 +0200
6449
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
6450
+# Makefile.in generated by automake 1.11 from Makefile.am.
6453
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
6454
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
6455
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
6457
# This Makefile.in is free software; the Free Software Foundation
6458
# gives unlimited permission to copy and/or distribute it,
6459
# with or without modifications, as long as this notice is preserved.
6463
pkgdatadir = $(datadir)/@PACKAGE@
6464
-pkglibdir = $(libdir)/@PACKAGE@
6465
pkgincludedir = $(includedir)/@PACKAGE@
6466
+pkglibdir = $(libdir)/@PACKAGE@
6467
+pkglibexecdir = $(libexecdir)/@PACKAGE@
6468
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
6469
install_sh_DATA = $(install_sh) -c -m 644
6470
install_sh_PROGRAM = $(install_sh) -c
6473
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
6474
CONFIG_CLEAN_FILES =
6475
+CONFIG_CLEAN_VPATH_FILES =
6478
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
6480
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
6483
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
6484
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
6485
+am__install_max = 40
6486
+am__nobase_strip_setup = \
6487
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
6488
+am__nobase_strip = \
6489
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
6490
+am__nobase_list = $(am__nobase_strip_setup); \
6491
+ for p in $$list; do echo "$$p $$p"; done | \
6492
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
6493
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
6494
+ if (++n[$$2] == $(am__install_max)) \
6495
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
6496
+ END { for (dir in files) print dir, files[dir] }'
6498
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
6499
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
6500
am__installdirs = "$(DESTDIR)$(iconsdir)"
6501
-iconsDATA_INSTALL = $(INSTALL_DATA)
6502
DATA = $(icons_DATA)
6503
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
6506
PACKAGE_NAME = @PACKAGE_NAME@
6507
PACKAGE_STRING = @PACKAGE_STRING@
6508
PACKAGE_TARNAME = @PACKAGE_TARNAME@
6509
+PACKAGE_URL = @PACKAGE_URL@
6510
PACKAGE_VERSION = @PACKAGE_VERSION@
6511
PATH_SEPARATOR = @PATH_SEPARATOR@
6512
PKG_CONFIG = @PKG_CONFIG@
6517
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 22x22/devices/Makefile'; \
6518
- cd $(top_srcdir) && \
6519
- $(AUTOMAKE) --gnu 22x22/devices/Makefile
6520
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 22x22/devices/Makefile'; \
6521
+ $(am__cd) $(top_srcdir) && \
6522
+ $(AUTOMAKE) --gnu 22x22/devices/Makefile
6524
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
6526
@@ -233,23 +251,27 @@
6527
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
6528
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
6529
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
6530
+$(am__aclocal_m4_deps):
6531
install-iconsDATA: $(icons_DATA)
6533
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
6534
- @list='$(icons_DATA)'; for p in $$list; do \
6535
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
6536
+ for p in $$list; do \
6537
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
6538
- f=$(am__strip_dir) \
6539
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
6540
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
6542
+ done | $(am__base_list) | \
6543
+ while read files; do \
6544
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
6545
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
6548
uninstall-iconsDATA:
6549
@$(NORMAL_UNINSTALL)
6550
- @list='$(icons_DATA)'; for p in $$list; do \
6551
- f=$(am__strip_dir) \
6552
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
6553
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
6555
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
6556
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
6557
+ test -n "$$files" || exit 0; \
6558
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
6559
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
6563
@@ -273,13 +295,17 @@
6564
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
6565
if test -d $$d/$$file; then \
6566
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
6567
+ if test -d "$(distdir)/$$file"; then \
6568
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
6570
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
6571
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
6572
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
6573
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
6575
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
6576
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
6578
- test -f $(distdir)/$$file \
6579
- || cp -p $$d/$$file $(distdir)/$$file \
6580
+ test -f "$(distdir)/$$file" \
6581
+ || cp -p $$d/$$file "$(distdir)/$$file" \
6588
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
6589
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
6591
maintainer-clean-generic:
6592
@echo "This command is intended for maintainers to use"
6602
@@ -337,18 +366,28 @@
6604
install-dvi: install-dvi-am
6610
install-html: install-html-am
6614
install-info: install-info-am
6620
install-pdf: install-pdf-am
6624
install-ps: install-ps-am
6630
maintainer-clean: maintainer-clean-am
6636
# Tell versions [3.59,3.63) of GNU make to not export all variables.
6637
# Otherwise a system limit (for SysV at least) may be exceeded.
6639
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/22x22/emblems/Makefile.in gnome-icon-theme-2.27.90.new/22x22/emblems/Makefile.in
6640
--- gnome-icon-theme-2.27.90/22x22/emblems/Makefile.in 2009-08-13 03:45:40.000000000 +0200
6641
+++ gnome-icon-theme-2.27.90.new/22x22/emblems/Makefile.in 2009-08-27 12:38:27.000000000 +0200
6643
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
6644
+# Makefile.in generated by automake 1.11 from Makefile.am.
6647
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
6648
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
6649
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
6651
# This Makefile.in is free software; the Free Software Foundation
6652
# gives unlimited permission to copy and/or distribute it,
6653
# with or without modifications, as long as this notice is preserved.
6657
pkgdatadir = $(datadir)/@PACKAGE@
6658
-pkglibdir = $(libdir)/@PACKAGE@
6659
pkgincludedir = $(includedir)/@PACKAGE@
6660
+pkglibdir = $(libdir)/@PACKAGE@
6661
+pkglibexecdir = $(libexecdir)/@PACKAGE@
6662
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
6663
install_sh_DATA = $(install_sh) -c -m 644
6664
install_sh_PROGRAM = $(install_sh) -c
6667
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
6668
CONFIG_CLEAN_FILES =
6669
+CONFIG_CLEAN_VPATH_FILES =
6672
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
6674
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
6677
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
6678
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
6679
+am__install_max = 40
6680
+am__nobase_strip_setup = \
6681
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
6682
+am__nobase_strip = \
6683
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
6684
+am__nobase_list = $(am__nobase_strip_setup); \
6685
+ for p in $$list; do echo "$$p $$p"; done | \
6686
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
6687
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
6688
+ if (++n[$$2] == $(am__install_max)) \
6689
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
6690
+ END { for (dir in files) print dir, files[dir] }'
6692
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
6693
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
6694
am__installdirs = "$(DESTDIR)$(iconsdir)"
6695
-iconsDATA_INSTALL = $(INSTALL_DATA)
6696
DATA = $(icons_DATA)
6697
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
6700
PACKAGE_NAME = @PACKAGE_NAME@
6701
PACKAGE_STRING = @PACKAGE_STRING@
6702
PACKAGE_TARNAME = @PACKAGE_TARNAME@
6703
+PACKAGE_URL = @PACKAGE_URL@
6704
PACKAGE_VERSION = @PACKAGE_VERSION@
6705
PATH_SEPARATOR = @PATH_SEPARATOR@
6706
PKG_CONFIG = @PKG_CONFIG@
6711
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 22x22/emblems/Makefile'; \
6712
- cd $(top_srcdir) && \
6713
- $(AUTOMAKE) --gnu 22x22/emblems/Makefile
6714
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 22x22/emblems/Makefile'; \
6715
+ $(am__cd) $(top_srcdir) && \
6716
+ $(AUTOMAKE) --gnu 22x22/emblems/Makefile
6718
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
6720
@@ -218,23 +236,27 @@
6721
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
6722
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
6723
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
6724
+$(am__aclocal_m4_deps):
6725
install-iconsDATA: $(icons_DATA)
6727
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
6728
- @list='$(icons_DATA)'; for p in $$list; do \
6729
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
6730
+ for p in $$list; do \
6731
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
6732
- f=$(am__strip_dir) \
6733
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
6734
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
6736
+ done | $(am__base_list) | \
6737
+ while read files; do \
6738
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
6739
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
6742
uninstall-iconsDATA:
6743
@$(NORMAL_UNINSTALL)
6744
- @list='$(icons_DATA)'; for p in $$list; do \
6745
- f=$(am__strip_dir) \
6746
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
6747
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
6749
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
6750
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
6751
+ test -n "$$files" || exit 0; \
6752
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
6753
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
6757
@@ -258,13 +280,17 @@
6758
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
6759
if test -d $$d/$$file; then \
6760
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
6761
+ if test -d "$(distdir)/$$file"; then \
6762
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
6764
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
6765
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
6766
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
6767
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
6769
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
6770
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
6772
- test -f $(distdir)/$$file \
6773
- || cp -p $$d/$$file $(distdir)/$$file \
6774
+ test -f "$(distdir)/$$file" \
6775
+ || cp -p $$d/$$file "$(distdir)/$$file" \
6782
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
6783
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
6785
maintainer-clean-generic:
6786
@echo "This command is intended for maintainers to use"
6796
@@ -321,18 +350,28 @@
6798
install-dvi: install-dvi-am
6804
install-html: install-html-am
6808
install-info: install-info-am
6814
install-pdf: install-pdf-am
6818
install-ps: install-ps-am
6824
maintainer-clean: maintainer-clean-am
6830
# Tell versions [3.59,3.63) of GNU make to not export all variables.
6831
# Otherwise a system limit (for SysV at least) may be exceeded.
6833
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/22x22/emotes/Makefile.in gnome-icon-theme-2.27.90.new/22x22/emotes/Makefile.in
6834
--- gnome-icon-theme-2.27.90/22x22/emotes/Makefile.in 2009-08-13 03:45:41.000000000 +0200
6835
+++ gnome-icon-theme-2.27.90.new/22x22/emotes/Makefile.in 2009-08-27 12:38:27.000000000 +0200
6837
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
6838
+# Makefile.in generated by automake 1.11 from Makefile.am.
6841
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
6842
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
6843
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
6845
# This Makefile.in is free software; the Free Software Foundation
6846
# gives unlimited permission to copy and/or distribute it,
6847
# with or without modifications, as long as this notice is preserved.
6851
pkgdatadir = $(datadir)/@PACKAGE@
6852
-pkglibdir = $(libdir)/@PACKAGE@
6853
pkgincludedir = $(includedir)/@PACKAGE@
6854
+pkglibdir = $(libdir)/@PACKAGE@
6855
+pkglibexecdir = $(libexecdir)/@PACKAGE@
6856
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
6857
install_sh_DATA = $(install_sh) -c -m 644
6858
install_sh_PROGRAM = $(install_sh) -c
6861
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
6862
CONFIG_CLEAN_FILES =
6863
+CONFIG_CLEAN_VPATH_FILES =
6866
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
6868
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
6871
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
6872
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
6873
+am__install_max = 40
6874
+am__nobase_strip_setup = \
6875
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
6876
+am__nobase_strip = \
6877
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
6878
+am__nobase_list = $(am__nobase_strip_setup); \
6879
+ for p in $$list; do echo "$$p $$p"; done | \
6880
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
6881
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
6882
+ if (++n[$$2] == $(am__install_max)) \
6883
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
6884
+ END { for (dir in files) print dir, files[dir] }'
6886
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
6887
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
6888
am__installdirs = "$(DESTDIR)$(iconsdir)"
6889
-iconsDATA_INSTALL = $(INSTALL_DATA)
6890
DATA = $(icons_DATA)
6891
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
6894
PACKAGE_NAME = @PACKAGE_NAME@
6895
PACKAGE_STRING = @PACKAGE_STRING@
6896
PACKAGE_TARNAME = @PACKAGE_TARNAME@
6897
+PACKAGE_URL = @PACKAGE_URL@
6898
PACKAGE_VERSION = @PACKAGE_VERSION@
6899
PATH_SEPARATOR = @PATH_SEPARATOR@
6900
PKG_CONFIG = @PKG_CONFIG@
6905
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 22x22/emotes/Makefile'; \
6906
- cd $(top_srcdir) && \
6907
- $(AUTOMAKE) --gnu 22x22/emotes/Makefile
6908
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 22x22/emotes/Makefile'; \
6909
+ $(am__cd) $(top_srcdir) && \
6910
+ $(AUTOMAKE) --gnu 22x22/emotes/Makefile
6912
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
6914
@@ -221,23 +239,27 @@
6915
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
6916
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
6917
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
6918
+$(am__aclocal_m4_deps):
6919
install-iconsDATA: $(icons_DATA)
6921
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
6922
- @list='$(icons_DATA)'; for p in $$list; do \
6923
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
6924
+ for p in $$list; do \
6925
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
6926
- f=$(am__strip_dir) \
6927
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
6928
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
6930
+ done | $(am__base_list) | \
6931
+ while read files; do \
6932
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
6933
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
6936
uninstall-iconsDATA:
6937
@$(NORMAL_UNINSTALL)
6938
- @list='$(icons_DATA)'; for p in $$list; do \
6939
- f=$(am__strip_dir) \
6940
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
6941
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
6943
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
6944
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
6945
+ test -n "$$files" || exit 0; \
6946
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
6947
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
6951
@@ -261,13 +283,17 @@
6952
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
6953
if test -d $$d/$$file; then \
6954
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
6955
+ if test -d "$(distdir)/$$file"; then \
6956
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
6958
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
6959
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
6960
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
6961
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
6963
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
6964
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
6966
- test -f $(distdir)/$$file \
6967
- || cp -p $$d/$$file $(distdir)/$$file \
6968
+ test -f "$(distdir)/$$file" \
6969
+ || cp -p $$d/$$file "$(distdir)/$$file" \
6976
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
6977
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
6979
maintainer-clean-generic:
6980
@echo "This command is intended for maintainers to use"
6990
@@ -324,18 +353,28 @@
6992
install-dvi: install-dvi-am
6998
install-html: install-html-am
7002
install-info: install-info-am
7008
install-pdf: install-pdf-am
7012
install-ps: install-ps-am
7018
maintainer-clean: maintainer-clean-am
7024
# Tell versions [3.59,3.63) of GNU make to not export all variables.
7025
# Otherwise a system limit (for SysV at least) may be exceeded.
7027
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/22x22/Makefile.in gnome-icon-theme-2.27.90.new/22x22/Makefile.in
7028
--- gnome-icon-theme-2.27.90/22x22/Makefile.in 2009-08-13 03:45:39.000000000 +0200
7029
+++ gnome-icon-theme-2.27.90.new/22x22/Makefile.in 2009-08-27 12:38:26.000000000 +0200
7031
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
7032
+# Makefile.in generated by automake 1.11 from Makefile.am.
7035
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
7036
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
7037
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
7039
# This Makefile.in is free software; the Free Software Foundation
7040
# gives unlimited permission to copy and/or distribute it,
7041
# with or without modifications, as long as this notice is preserved.
7045
pkgdatadir = $(datadir)/@PACKAGE@
7046
-pkglibdir = $(libdir)/@PACKAGE@
7047
pkgincludedir = $(includedir)/@PACKAGE@
7048
+pkglibdir = $(libdir)/@PACKAGE@
7049
+pkglibexecdir = $(libexecdir)/@PACKAGE@
7050
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
7051
install_sh_DATA = $(install_sh) -c -m 644
7052
install_sh_PROGRAM = $(install_sh) -c
7055
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
7056
CONFIG_CLEAN_FILES =
7057
+CONFIG_CLEAN_VPATH_FILES =
7060
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
7062
ps-recursive uninstall-recursive
7063
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
7064
distclean-recursive maintainer-clean-recursive
7065
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
7066
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
7070
DIST_SUBDIRS = $(SUBDIRS)
7071
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
7074
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
7075
+ sed_rest='s,^[^/]*/*,,'; \
7076
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
7077
+ sed_butlast='s,/*[^/]*$$,,'; \
7078
+ while test -n "$$dir1"; do \
7079
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
7080
+ if test "$$first" != "."; then \
7081
+ if test "$$first" = ".."; then \
7082
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
7083
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
7085
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
7086
+ if test "$$first2" = "$$first"; then \
7087
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
7089
+ dir2="../$$dir2"; \
7091
+ dir0="$$dir0"/"$$first"; \
7094
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
7098
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
7099
ALL_LINGUAS = @ALL_LINGUAS@
7101
PACKAGE_NAME = @PACKAGE_NAME@
7102
PACKAGE_STRING = @PACKAGE_STRING@
7103
PACKAGE_TARNAME = @PACKAGE_TARNAME@
7104
+PACKAGE_URL = @PACKAGE_URL@
7105
PACKAGE_VERSION = @PACKAGE_VERSION@
7106
PATH_SEPARATOR = @PATH_SEPARATOR@
7107
PKG_CONFIG = @PKG_CONFIG@
7112
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 22x22/Makefile'; \
7113
- cd $(top_srcdir) && \
7114
- $(AUTOMAKE) --gnu 22x22/Makefile
7115
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 22x22/Makefile'; \
7116
+ $(am__cd) $(top_srcdir) && \
7117
+ $(AUTOMAKE) --gnu 22x22/Makefile
7119
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
7122
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
7123
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
7124
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
7125
+$(am__aclocal_m4_deps):
7127
# This directory's subdirectories are mostly independent; you can cd
7128
# into them and run `make' without going through this Makefile.
7131
local_target="$$target"; \
7133
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
7134
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
7135
|| eval $$failcom; \
7137
if test "$$dot_seen" = "no"; then \
7138
@@ -270,16 +303,16 @@
7140
local_target="$$target"; \
7142
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
7143
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
7144
|| eval $$failcom; \
7145
done && test -z "$$fail"
7147
list='$(SUBDIRS)'; for subdir in $$list; do \
7148
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
7149
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
7152
list='$(SUBDIRS)'; for subdir in $$list; do \
7153
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
7154
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
7157
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
7160
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
7161
$(TAGS_FILES) $(LISP)
7165
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
7166
include_option=--etags-include; \
7168
list='$(SUBDIRS)'; for subdir in $$list; do \
7169
if test "$$subdir" = .; then :; else \
7170
test ! -f $$subdir/TAGS || \
7171
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
7172
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
7175
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
7176
@@ -315,29 +348,34 @@
7178
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
7179
END { if (nonempty) { for (i in files) print i; }; }'`; \
7180
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
7182
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
7183
test -n "$$unique" || unique=$$empty_fix; \
7184
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
7185
- $$tags $$unique; \
7186
+ if test $$# -gt 0; then \
7187
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
7190
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
7195
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
7196
$(TAGS_FILES) $(LISP)
7198
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
7199
unique=`for i in $$list; do \
7200
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
7202
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
7203
END { if (nonempty) { for (i in files) print i; }; }'`; \
7204
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
7205
+ test -z "$(CTAGS_ARGS)$$unique" \
7206
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
7211
here=`$(am__cd) $(top_builddir) && pwd` \
7212
- && cd $(top_srcdir) \
7213
- && gtags -i $(GTAGS_ARGS) $$here
7214
+ && $(am__cd) $(top_srcdir) \
7215
+ && gtags -i $(GTAGS_ARGS) "$$here"
7218
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
7219
@@ -358,29 +396,44 @@
7220
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
7221
if test -d $$d/$$file; then \
7222
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
7223
+ if test -d "$(distdir)/$$file"; then \
7224
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
7226
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
7227
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
7228
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
7229
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
7231
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
7232
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
7234
- test -f $(distdir)/$$file \
7235
- || cp -p $$d/$$file $(distdir)/$$file \
7236
+ test -f "$(distdir)/$$file" \
7237
+ || cp -p $$d/$$file "$(distdir)/$$file" \
7241
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
7242
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
7243
if test "$$subdir" = .; then :; else \
7244
test -d "$(distdir)/$$subdir" \
7245
|| $(MKDIR_P) "$(distdir)/$$subdir" \
7247
- distdir=`$(am__cd) $(distdir) && pwd`; \
7248
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
7252
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
7253
+ if test "$$subdir" = .; then :; else \
7254
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
7255
+ $(am__relativize); \
7256
+ new_distdir=$$reldir; \
7257
+ dir1=$$subdir; dir2="$(top_distdir)"; \
7258
+ $(am__relativize); \
7259
+ new_top_distdir=$$reldir; \
7260
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
7261
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
7262
+ ($(am__cd) $$subdir && \
7263
$(MAKE) $(AM_MAKEFLAGS) \
7264
- top_distdir="$$top_distdir" \
7265
- distdir="$$distdir/$$subdir" \
7266
+ top_distdir="$$new_top_distdir" \
7267
+ distdir="$$new_distdir" \
7268
am__remove_distdir=: \
7269
am__skip_length_check=: \
7270
+ am__skip_mode_fix=: \
7277
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
7278
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
7280
maintainer-clean-generic:
7281
@echo "This command is intended for maintainers to use"
7284
html: html-recursive
7288
info: info-recursive
7291
@@ -437,18 +493,28 @@
7293
install-dvi: install-dvi-recursive
7299
install-html: install-html-recursive
7303
install-info: install-info-recursive
7309
install-pdf: install-pdf-recursive
7313
install-ps: install-ps-recursive
7319
maintainer-clean: maintainer-clean-recursive
7324
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
7326
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
7327
+ install-am install-strip tags-recursive
7329
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
7330
all all-am check check-am clean clean-generic ctags \
7332
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
7333
tags-recursive uninstall uninstall-am
7336
# Tell versions [3.59,3.63) of GNU make to not export all variables.
7337
# Otherwise a system limit (for SysV at least) may be exceeded.
7339
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/22x22/mimetypes/Makefile.in gnome-icon-theme-2.27.90.new/22x22/mimetypes/Makefile.in
7340
--- gnome-icon-theme-2.27.90/22x22/mimetypes/Makefile.in 2009-08-27 12:37:22.000000000 +0200
7341
+++ gnome-icon-theme-2.27.90.new/22x22/mimetypes/Makefile.in 2009-08-27 12:38:27.000000000 +0200
7343
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
7344
+# Makefile.in generated by automake 1.11 from Makefile.am.
7347
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
7348
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
7349
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
7351
# This Makefile.in is free software; the Free Software Foundation
7352
# gives unlimited permission to copy and/or distribute it,
7353
# with or without modifications, as long as this notice is preserved.
7357
pkgdatadir = $(datadir)/@PACKAGE@
7358
-pkglibdir = $(libdir)/@PACKAGE@
7359
pkgincludedir = $(includedir)/@PACKAGE@
7360
+pkglibdir = $(libdir)/@PACKAGE@
7361
+pkglibexecdir = $(libexecdir)/@PACKAGE@
7362
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
7363
install_sh_DATA = $(install_sh) -c -m 644
7364
install_sh_PROGRAM = $(install_sh) -c
7367
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
7368
CONFIG_CLEAN_FILES =
7369
+CONFIG_CLEAN_VPATH_FILES =
7372
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
7374
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
7377
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
7378
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
7379
+am__install_max = 40
7380
+am__nobase_strip_setup = \
7381
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
7382
+am__nobase_strip = \
7383
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
7384
+am__nobase_list = $(am__nobase_strip_setup); \
7385
+ for p in $$list; do echo "$$p $$p"; done | \
7386
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
7387
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
7388
+ if (++n[$$2] == $(am__install_max)) \
7389
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
7390
+ END { for (dir in files) print dir, files[dir] }'
7392
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
7393
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
7394
am__installdirs = "$(DESTDIR)$(iconsdir)"
7395
-iconsDATA_INSTALL = $(INSTALL_DATA)
7396
DATA = $(icons_DATA)
7397
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
7400
PACKAGE_NAME = @PACKAGE_NAME@
7401
PACKAGE_STRING = @PACKAGE_STRING@
7402
PACKAGE_TARNAME = @PACKAGE_TARNAME@
7403
+PACKAGE_URL = @PACKAGE_URL@
7404
PACKAGE_VERSION = @PACKAGE_VERSION@
7405
PATH_SEPARATOR = @PATH_SEPARATOR@
7406
PKG_CONFIG = @PKG_CONFIG@
7411
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 22x22/mimetypes/Makefile'; \
7412
- cd $(top_srcdir) && \
7413
- $(AUTOMAKE) --gnu 22x22/mimetypes/Makefile
7414
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 22x22/mimetypes/Makefile'; \
7415
+ $(am__cd) $(top_srcdir) && \
7416
+ $(AUTOMAKE) --gnu 22x22/mimetypes/Makefile
7418
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
7420
@@ -221,23 +239,27 @@
7421
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
7422
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
7423
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
7424
+$(am__aclocal_m4_deps):
7425
install-iconsDATA: $(icons_DATA)
7427
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
7428
- @list='$(icons_DATA)'; for p in $$list; do \
7429
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
7430
+ for p in $$list; do \
7431
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
7432
- f=$(am__strip_dir) \
7433
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
7434
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
7436
+ done | $(am__base_list) | \
7437
+ while read files; do \
7438
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
7439
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
7442
uninstall-iconsDATA:
7443
@$(NORMAL_UNINSTALL)
7444
- @list='$(icons_DATA)'; for p in $$list; do \
7445
- f=$(am__strip_dir) \
7446
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
7447
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
7449
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
7450
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
7451
+ test -n "$$files" || exit 0; \
7452
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
7453
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
7457
@@ -261,13 +283,17 @@
7458
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
7459
if test -d $$d/$$file; then \
7460
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
7461
+ if test -d "$(distdir)/$$file"; then \
7462
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
7464
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
7465
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
7466
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
7467
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
7469
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
7470
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
7472
- test -f $(distdir)/$$file \
7473
- || cp -p $$d/$$file $(distdir)/$$file \
7474
+ test -f "$(distdir)/$$file" \
7475
+ || cp -p $$d/$$file "$(distdir)/$$file" \
7482
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
7483
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
7485
maintainer-clean-generic:
7486
@echo "This command is intended for maintainers to use"
7496
@@ -324,18 +353,28 @@
7498
install-dvi: install-dvi-am
7504
install-html: install-html-am
7508
install-info: install-info-am
7514
install-pdf: install-pdf-am
7518
install-ps: install-ps-am
7524
maintainer-clean: maintainer-clean-am
7530
# Tell versions [3.59,3.63) of GNU make to not export all variables.
7531
# Otherwise a system limit (for SysV at least) may be exceeded.
7533
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/22x22/places/Makefile.in gnome-icon-theme-2.27.90.new/22x22/places/Makefile.in
7534
--- gnome-icon-theme-2.27.90/22x22/places/Makefile.in 2009-08-13 03:45:41.000000000 +0200
7535
+++ gnome-icon-theme-2.27.90.new/22x22/places/Makefile.in 2009-08-27 12:38:27.000000000 +0200
7537
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
7538
+# Makefile.in generated by automake 1.11 from Makefile.am.
7541
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
7542
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
7543
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
7545
# This Makefile.in is free software; the Free Software Foundation
7546
# gives unlimited permission to copy and/or distribute it,
7547
# with or without modifications, as long as this notice is preserved.
7551
pkgdatadir = $(datadir)/@PACKAGE@
7552
-pkglibdir = $(libdir)/@PACKAGE@
7553
pkgincludedir = $(includedir)/@PACKAGE@
7554
+pkglibdir = $(libdir)/@PACKAGE@
7555
+pkglibexecdir = $(libexecdir)/@PACKAGE@
7556
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
7557
install_sh_DATA = $(install_sh) -c -m 644
7558
install_sh_PROGRAM = $(install_sh) -c
7561
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
7562
CONFIG_CLEAN_FILES =
7563
+CONFIG_CLEAN_VPATH_FILES =
7566
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
7568
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
7571
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
7572
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
7573
+am__install_max = 40
7574
+am__nobase_strip_setup = \
7575
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
7576
+am__nobase_strip = \
7577
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
7578
+am__nobase_list = $(am__nobase_strip_setup); \
7579
+ for p in $$list; do echo "$$p $$p"; done | \
7580
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
7581
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
7582
+ if (++n[$$2] == $(am__install_max)) \
7583
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
7584
+ END { for (dir in files) print dir, files[dir] }'
7586
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
7587
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
7588
am__installdirs = "$(DESTDIR)$(iconsdir)"
7589
-iconsDATA_INSTALL = $(INSTALL_DATA)
7590
DATA = $(icons_DATA)
7591
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
7594
PACKAGE_NAME = @PACKAGE_NAME@
7595
PACKAGE_STRING = @PACKAGE_STRING@
7596
PACKAGE_TARNAME = @PACKAGE_TARNAME@
7597
+PACKAGE_URL = @PACKAGE_URL@
7598
PACKAGE_VERSION = @PACKAGE_VERSION@
7599
PATH_SEPARATOR = @PATH_SEPARATOR@
7600
PKG_CONFIG = @PKG_CONFIG@
7605
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 22x22/places/Makefile'; \
7606
- cd $(top_srcdir) && \
7607
- $(AUTOMAKE) --gnu 22x22/places/Makefile
7608
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 22x22/places/Makefile'; \
7609
+ $(am__cd) $(top_srcdir) && \
7610
+ $(AUTOMAKE) --gnu 22x22/places/Makefile
7612
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
7614
@@ -213,23 +231,27 @@
7615
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
7616
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
7617
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
7618
+$(am__aclocal_m4_deps):
7619
install-iconsDATA: $(icons_DATA)
7621
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
7622
- @list='$(icons_DATA)'; for p in $$list; do \
7623
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
7624
+ for p in $$list; do \
7625
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
7626
- f=$(am__strip_dir) \
7627
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
7628
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
7630
+ done | $(am__base_list) | \
7631
+ while read files; do \
7632
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
7633
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
7636
uninstall-iconsDATA:
7637
@$(NORMAL_UNINSTALL)
7638
- @list='$(icons_DATA)'; for p in $$list; do \
7639
- f=$(am__strip_dir) \
7640
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
7641
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
7643
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
7644
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
7645
+ test -n "$$files" || exit 0; \
7646
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
7647
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
7651
@@ -253,13 +275,17 @@
7652
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
7653
if test -d $$d/$$file; then \
7654
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
7655
+ if test -d "$(distdir)/$$file"; then \
7656
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
7658
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
7659
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
7660
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
7661
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
7663
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
7664
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
7666
- test -f $(distdir)/$$file \
7667
- || cp -p $$d/$$file $(distdir)/$$file \
7668
+ test -f "$(distdir)/$$file" \
7669
+ || cp -p $$d/$$file "$(distdir)/$$file" \
7676
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
7677
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
7679
maintainer-clean-generic:
7680
@echo "This command is intended for maintainers to use"
7690
@@ -316,18 +345,28 @@
7692
install-dvi: install-dvi-am
7698
install-html: install-html-am
7702
install-info: install-info-am
7708
install-pdf: install-pdf-am
7712
install-ps: install-ps-am
7718
maintainer-clean: maintainer-clean-am
7724
# Tell versions [3.59,3.63) of GNU make to not export all variables.
7725
# Otherwise a system limit (for SysV at least) may be exceeded.
7727
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/22x22/status/Makefile.in gnome-icon-theme-2.27.90.new/22x22/status/Makefile.in
7728
--- gnome-icon-theme-2.27.90/22x22/status/Makefile.in 2009-08-13 03:45:41.000000000 +0200
7729
+++ gnome-icon-theme-2.27.90.new/22x22/status/Makefile.in 2009-08-27 12:38:27.000000000 +0200
7731
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
7732
+# Makefile.in generated by automake 1.11 from Makefile.am.
7735
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
7736
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
7737
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
7739
# This Makefile.in is free software; the Free Software Foundation
7740
# gives unlimited permission to copy and/or distribute it,
7741
# with or without modifications, as long as this notice is preserved.
7745
pkgdatadir = $(datadir)/@PACKAGE@
7746
-pkglibdir = $(libdir)/@PACKAGE@
7747
pkgincludedir = $(includedir)/@PACKAGE@
7748
+pkglibdir = $(libdir)/@PACKAGE@
7749
+pkglibexecdir = $(libexecdir)/@PACKAGE@
7750
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
7751
install_sh_DATA = $(install_sh) -c -m 644
7752
install_sh_PROGRAM = $(install_sh) -c
7755
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
7756
CONFIG_CLEAN_FILES =
7757
+CONFIG_CLEAN_VPATH_FILES =
7760
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
7762
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
7765
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
7766
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
7767
+am__install_max = 40
7768
+am__nobase_strip_setup = \
7769
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
7770
+am__nobase_strip = \
7771
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
7772
+am__nobase_list = $(am__nobase_strip_setup); \
7773
+ for p in $$list; do echo "$$p $$p"; done | \
7774
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
7775
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
7776
+ if (++n[$$2] == $(am__install_max)) \
7777
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
7778
+ END { for (dir in files) print dir, files[dir] }'
7780
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
7781
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
7782
am__installdirs = "$(DESTDIR)$(iconsdir)"
7783
-iconsDATA_INSTALL = $(INSTALL_DATA)
7784
DATA = $(icons_DATA)
7785
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
7788
PACKAGE_NAME = @PACKAGE_NAME@
7789
PACKAGE_STRING = @PACKAGE_STRING@
7790
PACKAGE_TARNAME = @PACKAGE_TARNAME@
7791
+PACKAGE_URL = @PACKAGE_URL@
7792
PACKAGE_VERSION = @PACKAGE_VERSION@
7793
PATH_SEPARATOR = @PATH_SEPARATOR@
7794
PKG_CONFIG = @PKG_CONFIG@
7799
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 22x22/status/Makefile'; \
7800
- cd $(top_srcdir) && \
7801
- $(AUTOMAKE) --gnu 22x22/status/Makefile
7802
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 22x22/status/Makefile'; \
7803
+ $(am__cd) $(top_srcdir) && \
7804
+ $(AUTOMAKE) --gnu 22x22/status/Makefile
7806
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
7808
@@ -259,23 +277,27 @@
7809
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
7810
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
7811
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
7812
+$(am__aclocal_m4_deps):
7813
install-iconsDATA: $(icons_DATA)
7815
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
7816
- @list='$(icons_DATA)'; for p in $$list; do \
7817
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
7818
+ for p in $$list; do \
7819
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
7820
- f=$(am__strip_dir) \
7821
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
7822
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
7824
+ done | $(am__base_list) | \
7825
+ while read files; do \
7826
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
7827
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
7830
uninstall-iconsDATA:
7831
@$(NORMAL_UNINSTALL)
7832
- @list='$(icons_DATA)'; for p in $$list; do \
7833
- f=$(am__strip_dir) \
7834
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
7835
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
7837
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
7838
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
7839
+ test -n "$$files" || exit 0; \
7840
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
7841
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
7845
@@ -299,13 +321,17 @@
7846
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
7847
if test -d $$d/$$file; then \
7848
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
7849
+ if test -d "$(distdir)/$$file"; then \
7850
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
7852
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
7853
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
7854
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
7855
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
7857
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
7858
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
7860
- test -f $(distdir)/$$file \
7861
- || cp -p $$d/$$file $(distdir)/$$file \
7862
+ test -f "$(distdir)/$$file" \
7863
+ || cp -p $$d/$$file "$(distdir)/$$file" \
7870
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
7871
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
7873
maintainer-clean-generic:
7874
@echo "This command is intended for maintainers to use"
7884
@@ -363,18 +392,28 @@
7886
install-dvi: install-dvi-am
7892
install-html: install-html-am
7896
install-info: install-info-am
7902
install-pdf: install-pdf-am
7906
install-ps: install-ps-am
7912
maintainer-clean: maintainer-clean-am
7918
# Tell versions [3.59,3.63) of GNU make to not export all variables.
7919
# Otherwise a system limit (for SysV at least) may be exceeded.
7921
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/24x24/actions/Makefile.in gnome-icon-theme-2.27.90.new/24x24/actions/Makefile.in
7922
--- gnome-icon-theme-2.27.90/24x24/actions/Makefile.in 2009-08-13 03:45:41.000000000 +0200
7923
+++ gnome-icon-theme-2.27.90.new/24x24/actions/Makefile.in 2009-08-27 12:38:27.000000000 +0200
7925
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
7926
+# Makefile.in generated by automake 1.11 from Makefile.am.
7929
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
7930
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
7931
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
7933
# This Makefile.in is free software; the Free Software Foundation
7934
# gives unlimited permission to copy and/or distribute it,
7935
# with or without modifications, as long as this notice is preserved.
7939
pkgdatadir = $(datadir)/@PACKAGE@
7940
-pkglibdir = $(libdir)/@PACKAGE@
7941
pkgincludedir = $(includedir)/@PACKAGE@
7942
+pkglibdir = $(libdir)/@PACKAGE@
7943
+pkglibexecdir = $(libexecdir)/@PACKAGE@
7944
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
7945
install_sh_DATA = $(install_sh) -c -m 644
7946
install_sh_PROGRAM = $(install_sh) -c
7949
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
7950
CONFIG_CLEAN_FILES =
7951
+CONFIG_CLEAN_VPATH_FILES =
7954
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
7956
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
7959
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
7960
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
7961
+am__install_max = 40
7962
+am__nobase_strip_setup = \
7963
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
7964
+am__nobase_strip = \
7965
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
7966
+am__nobase_list = $(am__nobase_strip_setup); \
7967
+ for p in $$list; do echo "$$p $$p"; done | \
7968
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
7969
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
7970
+ if (++n[$$2] == $(am__install_max)) \
7971
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
7972
+ END { for (dir in files) print dir, files[dir] }'
7974
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
7975
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
7976
am__installdirs = "$(DESTDIR)$(iconsdir)"
7977
-iconsDATA_INSTALL = $(INSTALL_DATA)
7978
DATA = $(icons_DATA)
7979
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
7982
PACKAGE_NAME = @PACKAGE_NAME@
7983
PACKAGE_STRING = @PACKAGE_STRING@
7984
PACKAGE_TARNAME = @PACKAGE_TARNAME@
7985
+PACKAGE_URL = @PACKAGE_URL@
7986
PACKAGE_VERSION = @PACKAGE_VERSION@
7987
PATH_SEPARATOR = @PATH_SEPARATOR@
7988
PKG_CONFIG = @PKG_CONFIG@
7993
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/actions/Makefile'; \
7994
- cd $(top_srcdir) && \
7995
- $(AUTOMAKE) --gnu 24x24/actions/Makefile
7996
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/actions/Makefile'; \
7997
+ $(am__cd) $(top_srcdir) && \
7998
+ $(AUTOMAKE) --gnu 24x24/actions/Makefile
8000
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
8002
@@ -309,23 +327,27 @@
8003
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
8004
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
8005
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
8006
+$(am__aclocal_m4_deps):
8007
install-iconsDATA: $(icons_DATA)
8009
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
8010
- @list='$(icons_DATA)'; for p in $$list; do \
8011
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
8012
+ for p in $$list; do \
8013
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
8014
- f=$(am__strip_dir) \
8015
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
8016
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
8018
+ done | $(am__base_list) | \
8019
+ while read files; do \
8020
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
8021
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
8024
uninstall-iconsDATA:
8025
@$(NORMAL_UNINSTALL)
8026
- @list='$(icons_DATA)'; for p in $$list; do \
8027
- f=$(am__strip_dir) \
8028
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
8029
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
8031
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
8032
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
8033
+ test -n "$$files" || exit 0; \
8034
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
8035
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
8039
@@ -349,13 +371,17 @@
8040
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
8041
if test -d $$d/$$file; then \
8042
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
8043
+ if test -d "$(distdir)/$$file"; then \
8044
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
8046
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
8047
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
8048
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
8049
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
8051
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
8052
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
8054
- test -f $(distdir)/$$file \
8055
- || cp -p $$d/$$file $(distdir)/$$file \
8056
+ test -f "$(distdir)/$$file" \
8057
+ || cp -p $$d/$$file "$(distdir)/$$file" \
8064
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
8065
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
8067
maintainer-clean-generic:
8068
@echo "This command is intended for maintainers to use"
8078
@@ -413,18 +442,28 @@
8080
install-dvi: install-dvi-am
8086
install-html: install-html-am
8090
install-info: install-info-am
8096
install-pdf: install-pdf-am
8100
install-ps: install-ps-am
8106
maintainer-clean: maintainer-clean-am
8112
# Tell versions [3.59,3.63) of GNU make to not export all variables.
8113
# Otherwise a system limit (for SysV at least) may be exceeded.
8115
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/24x24/apps/Makefile.in gnome-icon-theme-2.27.90.new/24x24/apps/Makefile.in
8116
--- gnome-icon-theme-2.27.90/24x24/apps/Makefile.in 2009-08-13 03:45:42.000000000 +0200
8117
+++ gnome-icon-theme-2.27.90.new/24x24/apps/Makefile.in 2009-08-27 12:38:27.000000000 +0200
8119
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
8120
+# Makefile.in generated by automake 1.11 from Makefile.am.
8123
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
8124
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
8125
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
8127
# This Makefile.in is free software; the Free Software Foundation
8128
# gives unlimited permission to copy and/or distribute it,
8129
# with or without modifications, as long as this notice is preserved.
8133
pkgdatadir = $(datadir)/@PACKAGE@
8134
-pkglibdir = $(libdir)/@PACKAGE@
8135
pkgincludedir = $(includedir)/@PACKAGE@
8136
+pkglibdir = $(libdir)/@PACKAGE@
8137
+pkglibexecdir = $(libexecdir)/@PACKAGE@
8138
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
8139
install_sh_DATA = $(install_sh) -c -m 644
8140
install_sh_PROGRAM = $(install_sh) -c
8143
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
8144
CONFIG_CLEAN_FILES =
8145
+CONFIG_CLEAN_VPATH_FILES =
8148
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
8150
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
8153
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
8154
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
8155
+am__install_max = 40
8156
+am__nobase_strip_setup = \
8157
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
8158
+am__nobase_strip = \
8159
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
8160
+am__nobase_list = $(am__nobase_strip_setup); \
8161
+ for p in $$list; do echo "$$p $$p"; done | \
8162
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
8163
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
8164
+ if (++n[$$2] == $(am__install_max)) \
8165
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
8166
+ END { for (dir in files) print dir, files[dir] }'
8168
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
8169
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
8170
am__installdirs = "$(DESTDIR)$(iconsdir)"
8171
-iconsDATA_INSTALL = $(INSTALL_DATA)
8172
DATA = $(icons_DATA)
8173
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
8176
PACKAGE_NAME = @PACKAGE_NAME@
8177
PACKAGE_STRING = @PACKAGE_STRING@
8178
PACKAGE_TARNAME = @PACKAGE_TARNAME@
8179
+PACKAGE_URL = @PACKAGE_URL@
8180
PACKAGE_VERSION = @PACKAGE_VERSION@
8181
PATH_SEPARATOR = @PATH_SEPARATOR@
8182
PKG_CONFIG = @PKG_CONFIG@
8187
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/apps/Makefile'; \
8188
- cd $(top_srcdir) && \
8189
- $(AUTOMAKE) --gnu 24x24/apps/Makefile
8190
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/apps/Makefile'; \
8191
+ $(am__cd) $(top_srcdir) && \
8192
+ $(AUTOMAKE) --gnu 24x24/apps/Makefile
8194
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
8196
@@ -237,23 +255,27 @@
8197
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
8198
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
8199
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
8200
+$(am__aclocal_m4_deps):
8201
install-iconsDATA: $(icons_DATA)
8203
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
8204
- @list='$(icons_DATA)'; for p in $$list; do \
8205
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
8206
+ for p in $$list; do \
8207
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
8208
- f=$(am__strip_dir) \
8209
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
8210
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
8212
+ done | $(am__base_list) | \
8213
+ while read files; do \
8214
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
8215
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
8218
uninstall-iconsDATA:
8219
@$(NORMAL_UNINSTALL)
8220
- @list='$(icons_DATA)'; for p in $$list; do \
8221
- f=$(am__strip_dir) \
8222
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
8223
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
8225
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
8226
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
8227
+ test -n "$$files" || exit 0; \
8228
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
8229
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
8233
@@ -277,13 +299,17 @@
8234
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
8235
if test -d $$d/$$file; then \
8236
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
8237
+ if test -d "$(distdir)/$$file"; then \
8238
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
8240
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
8241
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
8242
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
8243
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
8245
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
8246
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
8248
- test -f $(distdir)/$$file \
8249
- || cp -p $$d/$$file $(distdir)/$$file \
8250
+ test -f "$(distdir)/$$file" \
8251
+ || cp -p $$d/$$file "$(distdir)/$$file" \
8258
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
8259
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
8261
maintainer-clean-generic:
8262
@echo "This command is intended for maintainers to use"
8272
@@ -341,18 +370,28 @@
8274
install-dvi: install-dvi-am
8280
install-html: install-html-am
8284
install-info: install-info-am
8290
install-pdf: install-pdf-am
8294
install-ps: install-ps-am
8300
maintainer-clean: maintainer-clean-am
8306
# Tell versions [3.59,3.63) of GNU make to not export all variables.
8307
# Otherwise a system limit (for SysV at least) may be exceeded.
8309
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/24x24/categories/Makefile.in gnome-icon-theme-2.27.90.new/24x24/categories/Makefile.in
8310
--- gnome-icon-theme-2.27.90/24x24/categories/Makefile.in 2009-08-13 03:45:42.000000000 +0200
8311
+++ gnome-icon-theme-2.27.90.new/24x24/categories/Makefile.in 2009-08-27 12:38:27.000000000 +0200
8313
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
8314
+# Makefile.in generated by automake 1.11 from Makefile.am.
8317
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
8318
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
8319
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
8321
# This Makefile.in is free software; the Free Software Foundation
8322
# gives unlimited permission to copy and/or distribute it,
8323
# with or without modifications, as long as this notice is preserved.
8327
pkgdatadir = $(datadir)/@PACKAGE@
8328
-pkglibdir = $(libdir)/@PACKAGE@
8329
pkgincludedir = $(includedir)/@PACKAGE@
8330
+pkglibdir = $(libdir)/@PACKAGE@
8331
+pkglibexecdir = $(libexecdir)/@PACKAGE@
8332
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
8333
install_sh_DATA = $(install_sh) -c -m 644
8334
install_sh_PROGRAM = $(install_sh) -c
8337
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
8338
CONFIG_CLEAN_FILES =
8339
+CONFIG_CLEAN_VPATH_FILES =
8342
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
8344
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
8347
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
8348
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
8349
+am__install_max = 40
8350
+am__nobase_strip_setup = \
8351
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
8352
+am__nobase_strip = \
8353
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
8354
+am__nobase_list = $(am__nobase_strip_setup); \
8355
+ for p in $$list; do echo "$$p $$p"; done | \
8356
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
8357
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
8358
+ if (++n[$$2] == $(am__install_max)) \
8359
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
8360
+ END { for (dir in files) print dir, files[dir] }'
8362
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
8363
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
8364
am__installdirs = "$(DESTDIR)$(iconsdir)"
8365
-iconsDATA_INSTALL = $(INSTALL_DATA)
8366
DATA = $(icons_DATA)
8367
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
8370
PACKAGE_NAME = @PACKAGE_NAME@
8371
PACKAGE_STRING = @PACKAGE_STRING@
8372
PACKAGE_TARNAME = @PACKAGE_TARNAME@
8373
+PACKAGE_URL = @PACKAGE_URL@
8374
PACKAGE_VERSION = @PACKAGE_VERSION@
8375
PATH_SEPARATOR = @PATH_SEPARATOR@
8376
PKG_CONFIG = @PKG_CONFIG@
8381
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/categories/Makefile'; \
8382
- cd $(top_srcdir) && \
8383
- $(AUTOMAKE) --gnu 24x24/categories/Makefile
8384
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/categories/Makefile'; \
8385
+ $(am__cd) $(top_srcdir) && \
8386
+ $(AUTOMAKE) --gnu 24x24/categories/Makefile
8388
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
8390
@@ -224,23 +242,27 @@
8391
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
8392
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
8393
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
8394
+$(am__aclocal_m4_deps):
8395
install-iconsDATA: $(icons_DATA)
8397
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
8398
- @list='$(icons_DATA)'; for p in $$list; do \
8399
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
8400
+ for p in $$list; do \
8401
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
8402
- f=$(am__strip_dir) \
8403
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
8404
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
8406
+ done | $(am__base_list) | \
8407
+ while read files; do \
8408
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
8409
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
8412
uninstall-iconsDATA:
8413
@$(NORMAL_UNINSTALL)
8414
- @list='$(icons_DATA)'; for p in $$list; do \
8415
- f=$(am__strip_dir) \
8416
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
8417
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
8419
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
8420
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
8421
+ test -n "$$files" || exit 0; \
8422
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
8423
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
8427
@@ -264,13 +286,17 @@
8428
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
8429
if test -d $$d/$$file; then \
8430
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
8431
+ if test -d "$(distdir)/$$file"; then \
8432
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
8434
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
8435
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
8436
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
8437
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
8439
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
8440
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
8442
- test -f $(distdir)/$$file \
8443
- || cp -p $$d/$$file $(distdir)/$$file \
8444
+ test -f "$(distdir)/$$file" \
8445
+ || cp -p $$d/$$file "$(distdir)/$$file" \
8452
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
8453
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
8455
maintainer-clean-generic:
8456
@echo "This command is intended for maintainers to use"
8466
@@ -328,18 +357,28 @@
8468
install-dvi: install-dvi-am
8474
install-html: install-html-am
8478
install-info: install-info-am
8484
install-pdf: install-pdf-am
8488
install-ps: install-ps-am
8494
maintainer-clean: maintainer-clean-am
8500
# Tell versions [3.59,3.63) of GNU make to not export all variables.
8501
# Otherwise a system limit (for SysV at least) may be exceeded.
8503
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/24x24/devices/Makefile.in gnome-icon-theme-2.27.90.new/24x24/devices/Makefile.in
8504
--- gnome-icon-theme-2.27.90/24x24/devices/Makefile.in 2009-08-13 03:45:42.000000000 +0200
8505
+++ gnome-icon-theme-2.27.90.new/24x24/devices/Makefile.in 2009-08-27 12:38:27.000000000 +0200
8507
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
8508
+# Makefile.in generated by automake 1.11 from Makefile.am.
8511
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
8512
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
8513
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
8515
# This Makefile.in is free software; the Free Software Foundation
8516
# gives unlimited permission to copy and/or distribute it,
8517
# with or without modifications, as long as this notice is preserved.
8521
pkgdatadir = $(datadir)/@PACKAGE@
8522
-pkglibdir = $(libdir)/@PACKAGE@
8523
pkgincludedir = $(includedir)/@PACKAGE@
8524
+pkglibdir = $(libdir)/@PACKAGE@
8525
+pkglibexecdir = $(libexecdir)/@PACKAGE@
8526
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
8527
install_sh_DATA = $(install_sh) -c -m 644
8528
install_sh_PROGRAM = $(install_sh) -c
8531
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
8532
CONFIG_CLEAN_FILES =
8533
+CONFIG_CLEAN_VPATH_FILES =
8536
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
8538
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
8541
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
8542
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
8543
+am__install_max = 40
8544
+am__nobase_strip_setup = \
8545
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
8546
+am__nobase_strip = \
8547
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
8548
+am__nobase_list = $(am__nobase_strip_setup); \
8549
+ for p in $$list; do echo "$$p $$p"; done | \
8550
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
8551
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
8552
+ if (++n[$$2] == $(am__install_max)) \
8553
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
8554
+ END { for (dir in files) print dir, files[dir] }'
8556
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
8557
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
8558
am__installdirs = "$(DESTDIR)$(iconsdir)"
8559
-iconsDATA_INSTALL = $(INSTALL_DATA)
8560
DATA = $(icons_DATA)
8561
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
8564
PACKAGE_NAME = @PACKAGE_NAME@
8565
PACKAGE_STRING = @PACKAGE_STRING@
8566
PACKAGE_TARNAME = @PACKAGE_TARNAME@
8567
+PACKAGE_URL = @PACKAGE_URL@
8568
PACKAGE_VERSION = @PACKAGE_VERSION@
8569
PATH_SEPARATOR = @PATH_SEPARATOR@
8570
PKG_CONFIG = @PKG_CONFIG@
8575
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/devices/Makefile'; \
8576
- cd $(top_srcdir) && \
8577
- $(AUTOMAKE) --gnu 24x24/devices/Makefile
8578
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/devices/Makefile'; \
8579
+ $(am__cd) $(top_srcdir) && \
8580
+ $(AUTOMAKE) --gnu 24x24/devices/Makefile
8582
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
8584
@@ -233,23 +251,27 @@
8585
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
8586
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
8587
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
8588
+$(am__aclocal_m4_deps):
8589
install-iconsDATA: $(icons_DATA)
8591
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
8592
- @list='$(icons_DATA)'; for p in $$list; do \
8593
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
8594
+ for p in $$list; do \
8595
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
8596
- f=$(am__strip_dir) \
8597
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
8598
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
8600
+ done | $(am__base_list) | \
8601
+ while read files; do \
8602
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
8603
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
8606
uninstall-iconsDATA:
8607
@$(NORMAL_UNINSTALL)
8608
- @list='$(icons_DATA)'; for p in $$list; do \
8609
- f=$(am__strip_dir) \
8610
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
8611
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
8613
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
8614
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
8615
+ test -n "$$files" || exit 0; \
8616
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
8617
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
8621
@@ -273,13 +295,17 @@
8622
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
8623
if test -d $$d/$$file; then \
8624
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
8625
+ if test -d "$(distdir)/$$file"; then \
8626
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
8628
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
8629
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
8630
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
8631
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
8633
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
8634
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
8636
- test -f $(distdir)/$$file \
8637
- || cp -p $$d/$$file $(distdir)/$$file \
8638
+ test -f "$(distdir)/$$file" \
8639
+ || cp -p $$d/$$file "$(distdir)/$$file" \
8646
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
8647
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
8649
maintainer-clean-generic:
8650
@echo "This command is intended for maintainers to use"
8660
@@ -337,18 +366,28 @@
8662
install-dvi: install-dvi-am
8668
install-html: install-html-am
8672
install-info: install-info-am
8678
install-pdf: install-pdf-am
8682
install-ps: install-ps-am
8688
maintainer-clean: maintainer-clean-am
8694
# Tell versions [3.59,3.63) of GNU make to not export all variables.
8695
# Otherwise a system limit (for SysV at least) may be exceeded.
8697
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/24x24/emblems/Makefile.in gnome-icon-theme-2.27.90.new/24x24/emblems/Makefile.in
8698
--- gnome-icon-theme-2.27.90/24x24/emblems/Makefile.in 2009-08-13 03:45:42.000000000 +0200
8699
+++ gnome-icon-theme-2.27.90.new/24x24/emblems/Makefile.in 2009-08-27 12:38:27.000000000 +0200
8701
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
8702
+# Makefile.in generated by automake 1.11 from Makefile.am.
8705
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
8706
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
8707
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
8709
# This Makefile.in is free software; the Free Software Foundation
8710
# gives unlimited permission to copy and/or distribute it,
8711
# with or without modifications, as long as this notice is preserved.
8715
pkgdatadir = $(datadir)/@PACKAGE@
8716
-pkglibdir = $(libdir)/@PACKAGE@
8717
pkgincludedir = $(includedir)/@PACKAGE@
8718
+pkglibdir = $(libdir)/@PACKAGE@
8719
+pkglibexecdir = $(libexecdir)/@PACKAGE@
8720
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
8721
install_sh_DATA = $(install_sh) -c -m 644
8722
install_sh_PROGRAM = $(install_sh) -c
8725
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
8726
CONFIG_CLEAN_FILES =
8727
+CONFIG_CLEAN_VPATH_FILES =
8730
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
8732
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
8735
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
8736
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
8737
+am__install_max = 40
8738
+am__nobase_strip_setup = \
8739
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
8740
+am__nobase_strip = \
8741
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
8742
+am__nobase_list = $(am__nobase_strip_setup); \
8743
+ for p in $$list; do echo "$$p $$p"; done | \
8744
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
8745
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
8746
+ if (++n[$$2] == $(am__install_max)) \
8747
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
8748
+ END { for (dir in files) print dir, files[dir] }'
8750
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
8751
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
8752
am__installdirs = "$(DESTDIR)$(iconsdir)"
8753
-iconsDATA_INSTALL = $(INSTALL_DATA)
8754
DATA = $(icons_DATA)
8755
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
8758
PACKAGE_NAME = @PACKAGE_NAME@
8759
PACKAGE_STRING = @PACKAGE_STRING@
8760
PACKAGE_TARNAME = @PACKAGE_TARNAME@
8761
+PACKAGE_URL = @PACKAGE_URL@
8762
PACKAGE_VERSION = @PACKAGE_VERSION@
8763
PATH_SEPARATOR = @PATH_SEPARATOR@
8764
PKG_CONFIG = @PKG_CONFIG@
8769
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/emblems/Makefile'; \
8770
- cd $(top_srcdir) && \
8771
- $(AUTOMAKE) --gnu 24x24/emblems/Makefile
8772
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/emblems/Makefile'; \
8773
+ $(am__cd) $(top_srcdir) && \
8774
+ $(AUTOMAKE) --gnu 24x24/emblems/Makefile
8776
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
8778
@@ -219,23 +237,27 @@
8779
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
8780
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
8781
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
8782
+$(am__aclocal_m4_deps):
8783
install-iconsDATA: $(icons_DATA)
8785
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
8786
- @list='$(icons_DATA)'; for p in $$list; do \
8787
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
8788
+ for p in $$list; do \
8789
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
8790
- f=$(am__strip_dir) \
8791
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
8792
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
8794
+ done | $(am__base_list) | \
8795
+ while read files; do \
8796
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
8797
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
8800
uninstall-iconsDATA:
8801
@$(NORMAL_UNINSTALL)
8802
- @list='$(icons_DATA)'; for p in $$list; do \
8803
- f=$(am__strip_dir) \
8804
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
8805
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
8807
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
8808
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
8809
+ test -n "$$files" || exit 0; \
8810
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
8811
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
8815
@@ -259,13 +281,17 @@
8816
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
8817
if test -d $$d/$$file; then \
8818
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
8819
+ if test -d "$(distdir)/$$file"; then \
8820
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
8822
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
8823
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
8824
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
8825
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
8827
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
8828
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
8830
- test -f $(distdir)/$$file \
8831
- || cp -p $$d/$$file $(distdir)/$$file \
8832
+ test -f "$(distdir)/$$file" \
8833
+ || cp -p $$d/$$file "$(distdir)/$$file" \
8840
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
8841
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
8843
maintainer-clean-generic:
8844
@echo "This command is intended for maintainers to use"
8854
@@ -322,18 +351,28 @@
8856
install-dvi: install-dvi-am
8862
install-html: install-html-am
8866
install-info: install-info-am
8872
install-pdf: install-pdf-am
8876
install-ps: install-ps-am
8882
maintainer-clean: maintainer-clean-am
8888
# Tell versions [3.59,3.63) of GNU make to not export all variables.
8889
# Otherwise a system limit (for SysV at least) may be exceeded.
8891
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/24x24/emotes/Makefile.in gnome-icon-theme-2.27.90.new/24x24/emotes/Makefile.in
8892
--- gnome-icon-theme-2.27.90/24x24/emotes/Makefile.in 2009-08-13 03:45:42.000000000 +0200
8893
+++ gnome-icon-theme-2.27.90.new/24x24/emotes/Makefile.in 2009-08-27 12:38:27.000000000 +0200
8895
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
8896
+# Makefile.in generated by automake 1.11 from Makefile.am.
8899
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
8900
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
8901
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
8903
# This Makefile.in is free software; the Free Software Foundation
8904
# gives unlimited permission to copy and/or distribute it,
8905
# with or without modifications, as long as this notice is preserved.
8909
pkgdatadir = $(datadir)/@PACKAGE@
8910
-pkglibdir = $(libdir)/@PACKAGE@
8911
pkgincludedir = $(includedir)/@PACKAGE@
8912
+pkglibdir = $(libdir)/@PACKAGE@
8913
+pkglibexecdir = $(libexecdir)/@PACKAGE@
8914
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
8915
install_sh_DATA = $(install_sh) -c -m 644
8916
install_sh_PROGRAM = $(install_sh) -c
8919
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
8920
CONFIG_CLEAN_FILES =
8921
+CONFIG_CLEAN_VPATH_FILES =
8924
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
8926
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
8929
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
8930
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
8931
+am__install_max = 40
8932
+am__nobase_strip_setup = \
8933
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
8934
+am__nobase_strip = \
8935
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
8936
+am__nobase_list = $(am__nobase_strip_setup); \
8937
+ for p in $$list; do echo "$$p $$p"; done | \
8938
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
8939
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
8940
+ if (++n[$$2] == $(am__install_max)) \
8941
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
8942
+ END { for (dir in files) print dir, files[dir] }'
8944
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
8945
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
8946
am__installdirs = "$(DESTDIR)$(iconsdir)"
8947
-iconsDATA_INSTALL = $(INSTALL_DATA)
8948
DATA = $(icons_DATA)
8949
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
8952
PACKAGE_NAME = @PACKAGE_NAME@
8953
PACKAGE_STRING = @PACKAGE_STRING@
8954
PACKAGE_TARNAME = @PACKAGE_TARNAME@
8955
+PACKAGE_URL = @PACKAGE_URL@
8956
PACKAGE_VERSION = @PACKAGE_VERSION@
8957
PATH_SEPARATOR = @PATH_SEPARATOR@
8958
PKG_CONFIG = @PKG_CONFIG@
8963
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/emotes/Makefile'; \
8964
- cd $(top_srcdir) && \
8965
- $(AUTOMAKE) --gnu 24x24/emotes/Makefile
8966
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/emotes/Makefile'; \
8967
+ $(am__cd) $(top_srcdir) && \
8968
+ $(AUTOMAKE) --gnu 24x24/emotes/Makefile
8970
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
8972
@@ -223,23 +241,27 @@
8973
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
8974
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
8975
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
8976
+$(am__aclocal_m4_deps):
8977
install-iconsDATA: $(icons_DATA)
8979
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
8980
- @list='$(icons_DATA)'; for p in $$list; do \
8981
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
8982
+ for p in $$list; do \
8983
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
8984
- f=$(am__strip_dir) \
8985
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
8986
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
8988
+ done | $(am__base_list) | \
8989
+ while read files; do \
8990
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
8991
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
8994
uninstall-iconsDATA:
8995
@$(NORMAL_UNINSTALL)
8996
- @list='$(icons_DATA)'; for p in $$list; do \
8997
- f=$(am__strip_dir) \
8998
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
8999
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
9001
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
9002
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
9003
+ test -n "$$files" || exit 0; \
9004
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
9005
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
9009
@@ -263,13 +285,17 @@
9010
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
9011
if test -d $$d/$$file; then \
9012
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
9013
+ if test -d "$(distdir)/$$file"; then \
9014
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
9016
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
9017
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
9018
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
9019
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
9021
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
9022
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
9024
- test -f $(distdir)/$$file \
9025
- || cp -p $$d/$$file $(distdir)/$$file \
9026
+ test -f "$(distdir)/$$file" \
9027
+ || cp -p $$d/$$file "$(distdir)/$$file" \
9034
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
9035
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
9037
maintainer-clean-generic:
9038
@echo "This command is intended for maintainers to use"
9048
@@ -326,18 +355,28 @@
9050
install-dvi: install-dvi-am
9056
install-html: install-html-am
9060
install-info: install-info-am
9066
install-pdf: install-pdf-am
9070
install-ps: install-ps-am
9076
maintainer-clean: maintainer-clean-am
9082
# Tell versions [3.59,3.63) of GNU make to not export all variables.
9083
# Otherwise a system limit (for SysV at least) may be exceeded.
9085
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/24x24/filesystems/Makefile.in gnome-icon-theme-2.27.90.new/24x24/filesystems/Makefile.in
9086
--- gnome-icon-theme-2.27.90/24x24/filesystems/Makefile.in 2009-08-13 03:45:43.000000000 +0200
9087
+++ gnome-icon-theme-2.27.90.new/24x24/filesystems/Makefile.in 2009-08-27 12:38:28.000000000 +0200
9089
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
9090
+# Makefile.in generated by automake 1.11 from Makefile.am.
9093
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
9094
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
9095
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
9097
# This Makefile.in is free software; the Free Software Foundation
9098
# gives unlimited permission to copy and/or distribute it,
9099
# with or without modifications, as long as this notice is preserved.
9103
pkgdatadir = $(datadir)/@PACKAGE@
9104
-pkglibdir = $(libdir)/@PACKAGE@
9105
pkgincludedir = $(includedir)/@PACKAGE@
9106
+pkglibdir = $(libdir)/@PACKAGE@
9107
+pkglibexecdir = $(libexecdir)/@PACKAGE@
9108
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
9109
install_sh_DATA = $(install_sh) -c -m 644
9110
install_sh_PROGRAM = $(install_sh) -c
9113
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
9114
CONFIG_CLEAN_FILES =
9115
+CONFIG_CLEAN_VPATH_FILES =
9118
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
9120
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
9123
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
9124
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
9125
+am__install_max = 40
9126
+am__nobase_strip_setup = \
9127
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
9128
+am__nobase_strip = \
9129
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
9130
+am__nobase_list = $(am__nobase_strip_setup); \
9131
+ for p in $$list; do echo "$$p $$p"; done | \
9132
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
9133
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
9134
+ if (++n[$$2] == $(am__install_max)) \
9135
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
9136
+ END { for (dir in files) print dir, files[dir] }'
9138
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
9139
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
9140
am__installdirs = "$(DESTDIR)$(iconsdir)"
9141
-iconsDATA_INSTALL = $(INSTALL_DATA)
9142
DATA = $(icons_DATA)
9143
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
9146
PACKAGE_NAME = @PACKAGE_NAME@
9147
PACKAGE_STRING = @PACKAGE_STRING@
9148
PACKAGE_TARNAME = @PACKAGE_TARNAME@
9149
+PACKAGE_URL = @PACKAGE_URL@
9150
PACKAGE_VERSION = @PACKAGE_VERSION@
9151
PATH_SEPARATOR = @PATH_SEPARATOR@
9152
PKG_CONFIG = @PKG_CONFIG@
9157
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/filesystems/Makefile'; \
9158
- cd $(top_srcdir) && \
9159
- $(AUTOMAKE) --gnu 24x24/filesystems/Makefile
9160
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/filesystems/Makefile'; \
9161
+ $(am__cd) $(top_srcdir) && \
9162
+ $(AUTOMAKE) --gnu 24x24/filesystems/Makefile
9164
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
9166
@@ -207,23 +225,27 @@
9167
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
9168
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
9169
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
9170
+$(am__aclocal_m4_deps):
9171
install-iconsDATA: $(icons_DATA)
9173
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
9174
- @list='$(icons_DATA)'; for p in $$list; do \
9175
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
9176
+ for p in $$list; do \
9177
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
9178
- f=$(am__strip_dir) \
9179
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
9180
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
9182
+ done | $(am__base_list) | \
9183
+ while read files; do \
9184
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
9185
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
9188
uninstall-iconsDATA:
9189
@$(NORMAL_UNINSTALL)
9190
- @list='$(icons_DATA)'; for p in $$list; do \
9191
- f=$(am__strip_dir) \
9192
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
9193
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
9195
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
9196
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
9197
+ test -n "$$files" || exit 0; \
9198
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
9199
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
9203
@@ -247,13 +269,17 @@
9204
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
9205
if test -d $$d/$$file; then \
9206
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
9207
+ if test -d "$(distdir)/$$file"; then \
9208
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
9210
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
9211
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
9212
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
9213
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
9215
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
9216
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
9218
- test -f $(distdir)/$$file \
9219
- || cp -p $$d/$$file $(distdir)/$$file \
9220
+ test -f "$(distdir)/$$file" \
9221
+ || cp -p $$d/$$file "$(distdir)/$$file" \
9228
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
9229
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
9231
maintainer-clean-generic:
9232
@echo "This command is intended for maintainers to use"
9242
@@ -311,18 +340,28 @@
9244
install-dvi: install-dvi-am
9250
install-html: install-html-am
9254
install-info: install-info-am
9260
install-pdf: install-pdf-am
9264
install-ps: install-ps-am
9270
maintainer-clean: maintainer-clean-am
9276
# Tell versions [3.59,3.63) of GNU make to not export all variables.
9277
# Otherwise a system limit (for SysV at least) may be exceeded.
9279
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/24x24/Makefile.in gnome-icon-theme-2.27.90.new/24x24/Makefile.in
9280
--- gnome-icon-theme-2.27.90/24x24/Makefile.in 2009-08-13 03:45:41.000000000 +0200
9281
+++ gnome-icon-theme-2.27.90.new/24x24/Makefile.in 2009-08-27 12:38:27.000000000 +0200
9283
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
9284
+# Makefile.in generated by automake 1.11 from Makefile.am.
9287
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
9288
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
9289
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
9291
# This Makefile.in is free software; the Free Software Foundation
9292
# gives unlimited permission to copy and/or distribute it,
9293
# with or without modifications, as long as this notice is preserved.
9297
pkgdatadir = $(datadir)/@PACKAGE@
9298
-pkglibdir = $(libdir)/@PACKAGE@
9299
pkgincludedir = $(includedir)/@PACKAGE@
9300
+pkglibdir = $(libdir)/@PACKAGE@
9301
+pkglibexecdir = $(libexecdir)/@PACKAGE@
9302
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
9303
install_sh_DATA = $(install_sh) -c -m 644
9304
install_sh_PROGRAM = $(install_sh) -c
9307
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
9308
CONFIG_CLEAN_FILES =
9309
+CONFIG_CLEAN_VPATH_FILES =
9312
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
9314
ps-recursive uninstall-recursive
9315
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
9316
distclean-recursive maintainer-clean-recursive
9317
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
9318
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
9322
DIST_SUBDIRS = $(SUBDIRS)
9323
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
9326
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
9327
+ sed_rest='s,^[^/]*/*,,'; \
9328
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
9329
+ sed_butlast='s,/*[^/]*$$,,'; \
9330
+ while test -n "$$dir1"; do \
9331
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
9332
+ if test "$$first" != "."; then \
9333
+ if test "$$first" = ".."; then \
9334
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
9335
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
9337
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
9338
+ if test "$$first2" = "$$first"; then \
9339
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
9341
+ dir2="../$$dir2"; \
9343
+ dir0="$$dir0"/"$$first"; \
9346
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
9350
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
9351
ALL_LINGUAS = @ALL_LINGUAS@
9353
PACKAGE_NAME = @PACKAGE_NAME@
9354
PACKAGE_STRING = @PACKAGE_STRING@
9355
PACKAGE_TARNAME = @PACKAGE_TARNAME@
9356
+PACKAGE_URL = @PACKAGE_URL@
9357
PACKAGE_VERSION = @PACKAGE_VERSION@
9358
PATH_SEPARATOR = @PATH_SEPARATOR@
9359
PKG_CONFIG = @PKG_CONFIG@
9364
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/Makefile'; \
9365
- cd $(top_srcdir) && \
9366
- $(AUTOMAKE) --gnu 24x24/Makefile
9367
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/Makefile'; \
9368
+ $(am__cd) $(top_srcdir) && \
9369
+ $(AUTOMAKE) --gnu 24x24/Makefile
9371
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
9374
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
9375
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
9376
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
9377
+$(am__aclocal_m4_deps):
9379
# This directory's subdirectories are mostly independent; you can cd
9380
# into them and run `make' without going through this Makefile.
9383
local_target="$$target"; \
9385
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
9386
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
9387
|| eval $$failcom; \
9389
if test "$$dot_seen" = "no"; then \
9390
@@ -271,16 +304,16 @@
9392
local_target="$$target"; \
9394
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
9395
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
9396
|| eval $$failcom; \
9397
done && test -z "$$fail"
9399
list='$(SUBDIRS)'; for subdir in $$list; do \
9400
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
9401
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
9404
list='$(SUBDIRS)'; for subdir in $$list; do \
9405
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
9406
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
9409
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
9412
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
9413
$(TAGS_FILES) $(LISP)
9417
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
9418
include_option=--etags-include; \
9420
list='$(SUBDIRS)'; for subdir in $$list; do \
9421
if test "$$subdir" = .; then :; else \
9422
test ! -f $$subdir/TAGS || \
9423
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
9424
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
9427
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
9428
@@ -316,29 +349,34 @@
9430
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
9431
END { if (nonempty) { for (i in files) print i; }; }'`; \
9432
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
9434
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
9435
test -n "$$unique" || unique=$$empty_fix; \
9436
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
9437
- $$tags $$unique; \
9438
+ if test $$# -gt 0; then \
9439
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
9442
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
9447
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
9448
$(TAGS_FILES) $(LISP)
9450
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
9451
unique=`for i in $$list; do \
9452
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
9454
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
9455
END { if (nonempty) { for (i in files) print i; }; }'`; \
9456
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
9457
+ test -z "$(CTAGS_ARGS)$$unique" \
9458
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
9463
here=`$(am__cd) $(top_builddir) && pwd` \
9464
- && cd $(top_srcdir) \
9465
- && gtags -i $(GTAGS_ARGS) $$here
9466
+ && $(am__cd) $(top_srcdir) \
9467
+ && gtags -i $(GTAGS_ARGS) "$$here"
9470
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
9471
@@ -359,29 +397,44 @@
9472
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
9473
if test -d $$d/$$file; then \
9474
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
9475
+ if test -d "$(distdir)/$$file"; then \
9476
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
9478
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
9479
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
9480
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
9481
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
9483
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
9484
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
9486
- test -f $(distdir)/$$file \
9487
- || cp -p $$d/$$file $(distdir)/$$file \
9488
+ test -f "$(distdir)/$$file" \
9489
+ || cp -p $$d/$$file "$(distdir)/$$file" \
9493
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
9494
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
9495
if test "$$subdir" = .; then :; else \
9496
test -d "$(distdir)/$$subdir" \
9497
|| $(MKDIR_P) "$(distdir)/$$subdir" \
9499
- distdir=`$(am__cd) $(distdir) && pwd`; \
9500
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
9504
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
9505
+ if test "$$subdir" = .; then :; else \
9506
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
9507
+ $(am__relativize); \
9508
+ new_distdir=$$reldir; \
9509
+ dir1=$$subdir; dir2="$(top_distdir)"; \
9510
+ $(am__relativize); \
9511
+ new_top_distdir=$$reldir; \
9512
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
9513
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
9514
+ ($(am__cd) $$subdir && \
9515
$(MAKE) $(AM_MAKEFLAGS) \
9516
- top_distdir="$$top_distdir" \
9517
- distdir="$$distdir/$$subdir" \
9518
+ top_distdir="$$new_top_distdir" \
9519
+ distdir="$$new_distdir" \
9520
am__remove_distdir=: \
9521
am__skip_length_check=: \
9522
+ am__skip_mode_fix=: \
9529
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
9530
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
9532
maintainer-clean-generic:
9533
@echo "This command is intended for maintainers to use"
9536
html: html-recursive
9540
info: info-recursive
9543
@@ -438,18 +494,28 @@
9545
install-dvi: install-dvi-recursive
9551
install-html: install-html-recursive
9555
install-info: install-info-recursive
9561
install-pdf: install-pdf-recursive
9565
install-ps: install-ps-recursive
9571
maintainer-clean: maintainer-clean-recursive
9576
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
9578
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
9579
+ install-am install-strip tags-recursive
9581
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
9582
all all-am check check-am clean clean-generic ctags \
9584
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
9585
tags-recursive uninstall uninstall-am
9588
# Tell versions [3.59,3.63) of GNU make to not export all variables.
9589
# Otherwise a system limit (for SysV at least) may be exceeded.
9591
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/24x24/mimetypes/Makefile.in gnome-icon-theme-2.27.90.new/24x24/mimetypes/Makefile.in
9592
--- gnome-icon-theme-2.27.90/24x24/mimetypes/Makefile.in 2009-08-27 12:37:22.000000000 +0200
9593
+++ gnome-icon-theme-2.27.90.new/24x24/mimetypes/Makefile.in 2009-08-27 12:38:28.000000000 +0200
9595
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
9596
+# Makefile.in generated by automake 1.11 from Makefile.am.
9599
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
9600
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
9601
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
9603
# This Makefile.in is free software; the Free Software Foundation
9604
# gives unlimited permission to copy and/or distribute it,
9605
# with or without modifications, as long as this notice is preserved.
9609
pkgdatadir = $(datadir)/@PACKAGE@
9610
-pkglibdir = $(libdir)/@PACKAGE@
9611
pkgincludedir = $(includedir)/@PACKAGE@
9612
+pkglibdir = $(libdir)/@PACKAGE@
9613
+pkglibexecdir = $(libexecdir)/@PACKAGE@
9614
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
9615
install_sh_DATA = $(install_sh) -c -m 644
9616
install_sh_PROGRAM = $(install_sh) -c
9619
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
9620
CONFIG_CLEAN_FILES =
9621
+CONFIG_CLEAN_VPATH_FILES =
9624
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
9626
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
9629
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
9630
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
9631
+am__install_max = 40
9632
+am__nobase_strip_setup = \
9633
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
9634
+am__nobase_strip = \
9635
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
9636
+am__nobase_list = $(am__nobase_strip_setup); \
9637
+ for p in $$list; do echo "$$p $$p"; done | \
9638
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
9639
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
9640
+ if (++n[$$2] == $(am__install_max)) \
9641
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
9642
+ END { for (dir in files) print dir, files[dir] }'
9644
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
9645
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
9646
am__installdirs = "$(DESTDIR)$(iconsdir)"
9647
-iconsDATA_INSTALL = $(INSTALL_DATA)
9648
DATA = $(icons_DATA)
9649
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
9652
PACKAGE_NAME = @PACKAGE_NAME@
9653
PACKAGE_STRING = @PACKAGE_STRING@
9654
PACKAGE_TARNAME = @PACKAGE_TARNAME@
9655
+PACKAGE_URL = @PACKAGE_URL@
9656
PACKAGE_VERSION = @PACKAGE_VERSION@
9657
PATH_SEPARATOR = @PATH_SEPARATOR@
9658
PKG_CONFIG = @PKG_CONFIG@
9663
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/mimetypes/Makefile'; \
9664
- cd $(top_srcdir) && \
9665
- $(AUTOMAKE) --gnu 24x24/mimetypes/Makefile
9666
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/mimetypes/Makefile'; \
9667
+ $(am__cd) $(top_srcdir) && \
9668
+ $(AUTOMAKE) --gnu 24x24/mimetypes/Makefile
9670
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
9672
@@ -224,23 +242,27 @@
9673
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
9674
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
9675
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
9676
+$(am__aclocal_m4_deps):
9677
install-iconsDATA: $(icons_DATA)
9679
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
9680
- @list='$(icons_DATA)'; for p in $$list; do \
9681
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
9682
+ for p in $$list; do \
9683
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
9684
- f=$(am__strip_dir) \
9685
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
9686
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
9688
+ done | $(am__base_list) | \
9689
+ while read files; do \
9690
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
9691
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
9694
uninstall-iconsDATA:
9695
@$(NORMAL_UNINSTALL)
9696
- @list='$(icons_DATA)'; for p in $$list; do \
9697
- f=$(am__strip_dir) \
9698
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
9699
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
9701
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
9702
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
9703
+ test -n "$$files" || exit 0; \
9704
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
9705
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
9709
@@ -264,13 +286,17 @@
9710
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
9711
if test -d $$d/$$file; then \
9712
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
9713
+ if test -d "$(distdir)/$$file"; then \
9714
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
9716
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
9717
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
9718
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
9719
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
9721
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
9722
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
9724
- test -f $(distdir)/$$file \
9725
- || cp -p $$d/$$file $(distdir)/$$file \
9726
+ test -f "$(distdir)/$$file" \
9727
+ || cp -p $$d/$$file "$(distdir)/$$file" \
9734
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
9735
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
9737
maintainer-clean-generic:
9738
@echo "This command is intended for maintainers to use"
9748
@@ -328,18 +357,28 @@
9750
install-dvi: install-dvi-am
9756
install-html: install-html-am
9760
install-info: install-info-am
9766
install-pdf: install-pdf-am
9770
install-ps: install-ps-am
9776
maintainer-clean: maintainer-clean-am
9782
# Tell versions [3.59,3.63) of GNU make to not export all variables.
9783
# Otherwise a system limit (for SysV at least) may be exceeded.
9785
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/24x24/places/Makefile.in gnome-icon-theme-2.27.90.new/24x24/places/Makefile.in
9786
--- gnome-icon-theme-2.27.90/24x24/places/Makefile.in 2009-08-13 03:45:43.000000000 +0200
9787
+++ gnome-icon-theme-2.27.90.new/24x24/places/Makefile.in 2009-08-27 12:38:28.000000000 +0200
9789
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
9790
+# Makefile.in generated by automake 1.11 from Makefile.am.
9793
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
9794
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
9795
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
9797
# This Makefile.in is free software; the Free Software Foundation
9798
# gives unlimited permission to copy and/or distribute it,
9799
# with or without modifications, as long as this notice is preserved.
9803
pkgdatadir = $(datadir)/@PACKAGE@
9804
-pkglibdir = $(libdir)/@PACKAGE@
9805
pkgincludedir = $(includedir)/@PACKAGE@
9806
+pkglibdir = $(libdir)/@PACKAGE@
9807
+pkglibexecdir = $(libexecdir)/@PACKAGE@
9808
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
9809
install_sh_DATA = $(install_sh) -c -m 644
9810
install_sh_PROGRAM = $(install_sh) -c
9813
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
9814
CONFIG_CLEAN_FILES =
9815
+CONFIG_CLEAN_VPATH_FILES =
9818
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
9820
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
9823
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
9824
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
9825
+am__install_max = 40
9826
+am__nobase_strip_setup = \
9827
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
9828
+am__nobase_strip = \
9829
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
9830
+am__nobase_list = $(am__nobase_strip_setup); \
9831
+ for p in $$list; do echo "$$p $$p"; done | \
9832
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
9833
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
9834
+ if (++n[$$2] == $(am__install_max)) \
9835
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
9836
+ END { for (dir in files) print dir, files[dir] }'
9838
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
9839
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
9840
am__installdirs = "$(DESTDIR)$(iconsdir)"
9841
-iconsDATA_INSTALL = $(INSTALL_DATA)
9842
DATA = $(icons_DATA)
9843
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
9846
PACKAGE_NAME = @PACKAGE_NAME@
9847
PACKAGE_STRING = @PACKAGE_STRING@
9848
PACKAGE_TARNAME = @PACKAGE_TARNAME@
9849
+PACKAGE_URL = @PACKAGE_URL@
9850
PACKAGE_VERSION = @PACKAGE_VERSION@
9851
PATH_SEPARATOR = @PATH_SEPARATOR@
9852
PKG_CONFIG = @PKG_CONFIG@
9857
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/places/Makefile'; \
9858
- cd $(top_srcdir) && \
9859
- $(AUTOMAKE) --gnu 24x24/places/Makefile
9860
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/places/Makefile'; \
9861
+ $(am__cd) $(top_srcdir) && \
9862
+ $(AUTOMAKE) --gnu 24x24/places/Makefile
9864
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
9866
@@ -213,23 +231,27 @@
9867
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
9868
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
9869
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
9870
+$(am__aclocal_m4_deps):
9871
install-iconsDATA: $(icons_DATA)
9873
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
9874
- @list='$(icons_DATA)'; for p in $$list; do \
9875
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
9876
+ for p in $$list; do \
9877
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
9878
- f=$(am__strip_dir) \
9879
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
9880
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
9882
+ done | $(am__base_list) | \
9883
+ while read files; do \
9884
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
9885
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
9888
uninstall-iconsDATA:
9889
@$(NORMAL_UNINSTALL)
9890
- @list='$(icons_DATA)'; for p in $$list; do \
9891
- f=$(am__strip_dir) \
9892
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
9893
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
9895
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
9896
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
9897
+ test -n "$$files" || exit 0; \
9898
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
9899
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
9903
@@ -253,13 +275,17 @@
9904
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
9905
if test -d $$d/$$file; then \
9906
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
9907
+ if test -d "$(distdir)/$$file"; then \
9908
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
9910
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
9911
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
9912
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
9913
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
9915
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
9916
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
9918
- test -f $(distdir)/$$file \
9919
- || cp -p $$d/$$file $(distdir)/$$file \
9920
+ test -f "$(distdir)/$$file" \
9921
+ || cp -p $$d/$$file "$(distdir)/$$file" \
9928
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
9929
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
9931
maintainer-clean-generic:
9932
@echo "This command is intended for maintainers to use"
9942
@@ -316,18 +345,28 @@
9944
install-dvi: install-dvi-am
9950
install-html: install-html-am
9954
install-info: install-info-am
9960
install-pdf: install-pdf-am
9964
install-ps: install-ps-am
9970
maintainer-clean: maintainer-clean-am
9976
# Tell versions [3.59,3.63) of GNU make to not export all variables.
9977
# Otherwise a system limit (for SysV at least) may be exceeded.
9979
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/24x24/status/Makefile.in gnome-icon-theme-2.27.90.new/24x24/status/Makefile.in
9980
--- gnome-icon-theme-2.27.90/24x24/status/Makefile.in 2009-08-13 03:45:43.000000000 +0200
9981
+++ gnome-icon-theme-2.27.90.new/24x24/status/Makefile.in 2009-08-27 12:38:28.000000000 +0200
9983
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
9984
+# Makefile.in generated by automake 1.11 from Makefile.am.
9987
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
9988
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
9989
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
9991
# This Makefile.in is free software; the Free Software Foundation
9992
# gives unlimited permission to copy and/or distribute it,
9993
# with or without modifications, as long as this notice is preserved.
9997
pkgdatadir = $(datadir)/@PACKAGE@
9998
-pkglibdir = $(libdir)/@PACKAGE@
9999
pkgincludedir = $(includedir)/@PACKAGE@
10000
+pkglibdir = $(libdir)/@PACKAGE@
10001
+pkglibexecdir = $(libexecdir)/@PACKAGE@
10002
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
10003
install_sh_DATA = $(install_sh) -c -m 644
10004
install_sh_PROGRAM = $(install_sh) -c
10007
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
10008
CONFIG_CLEAN_FILES =
10009
+CONFIG_CLEAN_VPATH_FILES =
10012
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
10014
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
10017
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
10018
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
10019
+am__install_max = 40
10020
+am__nobase_strip_setup = \
10021
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
10022
+am__nobase_strip = \
10023
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
10024
+am__nobase_list = $(am__nobase_strip_setup); \
10025
+ for p in $$list; do echo "$$p $$p"; done | \
10026
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
10027
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
10028
+ if (++n[$$2] == $(am__install_max)) \
10029
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
10030
+ END { for (dir in files) print dir, files[dir] }'
10032
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
10033
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
10034
am__installdirs = "$(DESTDIR)$(iconsdir)"
10035
-iconsDATA_INSTALL = $(INSTALL_DATA)
10036
DATA = $(icons_DATA)
10037
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
10038
ACLOCAL = @ACLOCAL@
10039
@@ -106,6 +123,7 @@
10040
PACKAGE_NAME = @PACKAGE_NAME@
10041
PACKAGE_STRING = @PACKAGE_STRING@
10042
PACKAGE_TARNAME = @PACKAGE_TARNAME@
10043
+PACKAGE_URL = @PACKAGE_URL@
10044
PACKAGE_VERSION = @PACKAGE_VERSION@
10045
PATH_SEPARATOR = @PATH_SEPARATOR@
10046
PKG_CONFIG = @PKG_CONFIG@
10047
@@ -241,9 +259,9 @@
10051
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/status/Makefile'; \
10052
- cd $(top_srcdir) && \
10053
- $(AUTOMAKE) --gnu 24x24/status/Makefile
10054
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/status/Makefile'; \
10055
+ $(am__cd) $(top_srcdir) && \
10056
+ $(AUTOMAKE) --gnu 24x24/status/Makefile
10057
.PRECIOUS: Makefile
10058
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
10060
@@ -261,23 +279,27 @@
10061
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
10062
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
10063
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
10064
+$(am__aclocal_m4_deps):
10065
install-iconsDATA: $(icons_DATA)
10067
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
10068
- @list='$(icons_DATA)'; for p in $$list; do \
10069
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
10070
+ for p in $$list; do \
10071
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
10072
- f=$(am__strip_dir) \
10073
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
10074
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
10076
+ done | $(am__base_list) | \
10077
+ while read files; do \
10078
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
10079
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
10082
uninstall-iconsDATA:
10083
@$(NORMAL_UNINSTALL)
10084
- @list='$(icons_DATA)'; for p in $$list; do \
10085
- f=$(am__strip_dir) \
10086
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
10087
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
10089
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
10090
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
10091
+ test -n "$$files" || exit 0; \
10092
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
10093
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
10097
@@ -301,13 +323,17 @@
10098
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
10099
if test -d $$d/$$file; then \
10100
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
10101
+ if test -d "$(distdir)/$$file"; then \
10102
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
10104
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
10105
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
10106
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
10107
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
10109
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
10110
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
10112
- test -f $(distdir)/$$file \
10113
- || cp -p $$d/$$file $(distdir)/$$file \
10114
+ test -f "$(distdir)/$$file" \
10115
+ || cp -p $$d/$$file "$(distdir)/$$file" \
10119
@@ -338,6 +364,7 @@
10122
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
10123
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
10125
maintainer-clean-generic:
10126
@echo "This command is intended for maintainers to use"
10127
@@ -357,6 +384,8 @@
10136
@@ -365,18 +394,28 @@
10138
install-dvi: install-dvi-am
10144
install-html: install-html-am
10148
install-info: install-info-am
10154
install-pdf: install-pdf-am
10158
install-ps: install-ps-am
10164
maintainer-clean: maintainer-clean-am
10165
@@ -432,6 +471,7 @@
10170
# Tell versions [3.59,3.63) of GNU make to not export all variables.
10171
# Otherwise a system limit (for SysV at least) may be exceeded.
10173
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/24x24/stock/chart/Makefile.in gnome-icon-theme-2.27.90.new/24x24/stock/chart/Makefile.in
10174
--- gnome-icon-theme-2.27.90/24x24/stock/chart/Makefile.in 2009-08-13 03:45:44.000000000 +0200
10175
+++ gnome-icon-theme-2.27.90.new/24x24/stock/chart/Makefile.in 2009-08-27 12:38:28.000000000 +0200
10177
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
10178
+# Makefile.in generated by automake 1.11 from Makefile.am.
10179
# @configure_input@
10181
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
10182
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
10183
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
10185
# This Makefile.in is free software; the Free Software Foundation
10186
# gives unlimited permission to copy and/or distribute it,
10187
# with or without modifications, as long as this notice is preserved.
10191
pkgdatadir = $(datadir)/@PACKAGE@
10192
-pkglibdir = $(libdir)/@PACKAGE@
10193
pkgincludedir = $(includedir)/@PACKAGE@
10194
+pkglibdir = $(libdir)/@PACKAGE@
10195
+pkglibexecdir = $(libexecdir)/@PACKAGE@
10196
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
10197
install_sh_DATA = $(install_sh) -c -m 644
10198
install_sh_PROGRAM = $(install_sh) -c
10201
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
10202
CONFIG_CLEAN_FILES =
10203
+CONFIG_CLEAN_VPATH_FILES =
10206
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
10208
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
10211
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
10212
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
10213
+am__install_max = 40
10214
+am__nobase_strip_setup = \
10215
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
10216
+am__nobase_strip = \
10217
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
10218
+am__nobase_list = $(am__nobase_strip_setup); \
10219
+ for p in $$list; do echo "$$p $$p"; done | \
10220
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
10221
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
10222
+ if (++n[$$2] == $(am__install_max)) \
10223
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
10224
+ END { for (dir in files) print dir, files[dir] }'
10226
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
10227
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
10228
am__installdirs = "$(DESTDIR)$(icondir)"
10229
-iconDATA_INSTALL = $(INSTALL_DATA)
10230
DATA = $(icon_DATA)
10231
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
10232
ACLOCAL = @ACLOCAL@
10233
@@ -106,6 +123,7 @@
10234
PACKAGE_NAME = @PACKAGE_NAME@
10235
PACKAGE_STRING = @PACKAGE_STRING@
10236
PACKAGE_TARNAME = @PACKAGE_TARNAME@
10237
+PACKAGE_URL = @PACKAGE_URL@
10238
PACKAGE_VERSION = @PACKAGE_VERSION@
10239
PATH_SEPARATOR = @PATH_SEPARATOR@
10240
PKG_CONFIG = @PKG_CONFIG@
10241
@@ -207,9 +225,9 @@
10245
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/stock/chart/Makefile'; \
10246
- cd $(top_srcdir) && \
10247
- $(AUTOMAKE) --gnu 24x24/stock/chart/Makefile
10248
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/stock/chart/Makefile'; \
10249
+ $(am__cd) $(top_srcdir) && \
10250
+ $(AUTOMAKE) --gnu 24x24/stock/chart/Makefile
10251
.PRECIOUS: Makefile
10252
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
10254
@@ -227,23 +245,27 @@
10255
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
10256
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
10257
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
10258
+$(am__aclocal_m4_deps):
10259
install-iconDATA: $(icon_DATA)
10261
test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
10262
- @list='$(icon_DATA)'; for p in $$list; do \
10263
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
10264
+ for p in $$list; do \
10265
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
10266
- f=$(am__strip_dir) \
10267
- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
10268
- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
10270
+ done | $(am__base_list) | \
10271
+ while read files; do \
10272
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
10273
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
10276
uninstall-iconDATA:
10277
@$(NORMAL_UNINSTALL)
10278
- @list='$(icon_DATA)'; for p in $$list; do \
10279
- f=$(am__strip_dir) \
10280
- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
10281
- rm -f "$(DESTDIR)$(icondir)/$$f"; \
10283
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
10284
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
10285
+ test -n "$$files" || exit 0; \
10286
+ echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
10287
+ cd "$(DESTDIR)$(icondir)" && rm -f $$files
10291
@@ -267,13 +289,17 @@
10292
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
10293
if test -d $$d/$$file; then \
10294
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
10295
+ if test -d "$(distdir)/$$file"; then \
10296
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
10298
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
10299
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
10300
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
10301
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
10303
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
10304
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
10306
- test -f $(distdir)/$$file \
10307
- || cp -p $$d/$$file $(distdir)/$$file \
10308
+ test -f "$(distdir)/$$file" \
10309
+ || cp -p $$d/$$file "$(distdir)/$$file" \
10313
@@ -304,6 +330,7 @@
10316
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
10317
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
10319
maintainer-clean-generic:
10320
@echo "This command is intended for maintainers to use"
10321
@@ -322,6 +349,8 @@
10330
@@ -330,18 +359,28 @@
10332
install-dvi: install-dvi-am
10338
install-html: install-html-am
10342
install-info: install-info-am
10348
install-pdf: install-pdf-am
10352
install-ps: install-ps-am
10358
maintainer-clean: maintainer-clean-am
10359
@@ -375,6 +414,7 @@
10360
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
10361
uninstall-am uninstall-iconDATA
10364
# Tell versions [3.59,3.63) of GNU make to not export all variables.
10365
# Otherwise a system limit (for SysV at least) may be exceeded.
10367
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/24x24/stock/code/Makefile.in gnome-icon-theme-2.27.90.new/24x24/stock/code/Makefile.in
10368
--- gnome-icon-theme-2.27.90/24x24/stock/code/Makefile.in 2009-08-13 03:45:44.000000000 +0200
10369
+++ gnome-icon-theme-2.27.90.new/24x24/stock/code/Makefile.in 2009-08-27 12:38:28.000000000 +0200
10371
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
10372
+# Makefile.in generated by automake 1.11 from Makefile.am.
10373
# @configure_input@
10375
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
10376
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
10377
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
10379
# This Makefile.in is free software; the Free Software Foundation
10380
# gives unlimited permission to copy and/or distribute it,
10381
# with or without modifications, as long as this notice is preserved.
10385
pkgdatadir = $(datadir)/@PACKAGE@
10386
-pkglibdir = $(libdir)/@PACKAGE@
10387
pkgincludedir = $(includedir)/@PACKAGE@
10388
+pkglibdir = $(libdir)/@PACKAGE@
10389
+pkglibexecdir = $(libexecdir)/@PACKAGE@
10390
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
10391
install_sh_DATA = $(install_sh) -c -m 644
10392
install_sh_PROGRAM = $(install_sh) -c
10395
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
10396
CONFIG_CLEAN_FILES =
10397
+CONFIG_CLEAN_VPATH_FILES =
10400
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
10402
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
10405
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
10406
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
10407
+am__install_max = 40
10408
+am__nobase_strip_setup = \
10409
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
10410
+am__nobase_strip = \
10411
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
10412
+am__nobase_list = $(am__nobase_strip_setup); \
10413
+ for p in $$list; do echo "$$p $$p"; done | \
10414
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
10415
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
10416
+ if (++n[$$2] == $(am__install_max)) \
10417
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
10418
+ END { for (dir in files) print dir, files[dir] }'
10420
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
10421
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
10422
am__installdirs = "$(DESTDIR)$(icondir)"
10423
-iconDATA_INSTALL = $(INSTALL_DATA)
10424
DATA = $(icon_DATA)
10425
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
10426
ACLOCAL = @ACLOCAL@
10427
@@ -106,6 +123,7 @@
10428
PACKAGE_NAME = @PACKAGE_NAME@
10429
PACKAGE_STRING = @PACKAGE_STRING@
10430
PACKAGE_TARNAME = @PACKAGE_TARNAME@
10431
+PACKAGE_URL = @PACKAGE_URL@
10432
PACKAGE_VERSION = @PACKAGE_VERSION@
10433
PATH_SEPARATOR = @PATH_SEPARATOR@
10434
PKG_CONFIG = @PKG_CONFIG@
10435
@@ -200,9 +218,9 @@
10439
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/stock/code/Makefile'; \
10440
- cd $(top_srcdir) && \
10441
- $(AUTOMAKE) --gnu 24x24/stock/code/Makefile
10442
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/stock/code/Makefile'; \
10443
+ $(am__cd) $(top_srcdir) && \
10444
+ $(AUTOMAKE) --gnu 24x24/stock/code/Makefile
10445
.PRECIOUS: Makefile
10446
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
10448
@@ -220,23 +238,27 @@
10449
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
10450
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
10451
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
10452
+$(am__aclocal_m4_deps):
10453
install-iconDATA: $(icon_DATA)
10455
test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
10456
- @list='$(icon_DATA)'; for p in $$list; do \
10457
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
10458
+ for p in $$list; do \
10459
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
10460
- f=$(am__strip_dir) \
10461
- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
10462
- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
10464
+ done | $(am__base_list) | \
10465
+ while read files; do \
10466
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
10467
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
10470
uninstall-iconDATA:
10471
@$(NORMAL_UNINSTALL)
10472
- @list='$(icon_DATA)'; for p in $$list; do \
10473
- f=$(am__strip_dir) \
10474
- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
10475
- rm -f "$(DESTDIR)$(icondir)/$$f"; \
10477
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
10478
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
10479
+ test -n "$$files" || exit 0; \
10480
+ echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
10481
+ cd "$(DESTDIR)$(icondir)" && rm -f $$files
10485
@@ -260,13 +282,17 @@
10486
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
10487
if test -d $$d/$$file; then \
10488
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
10489
+ if test -d "$(distdir)/$$file"; then \
10490
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
10492
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
10493
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
10494
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
10495
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
10497
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
10498
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
10500
- test -f $(distdir)/$$file \
10501
- || cp -p $$d/$$file $(distdir)/$$file \
10502
+ test -f "$(distdir)/$$file" \
10503
+ || cp -p $$d/$$file "$(distdir)/$$file" \
10507
@@ -297,6 +323,7 @@
10510
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
10511
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
10513
maintainer-clean-generic:
10514
@echo "This command is intended for maintainers to use"
10515
@@ -315,6 +342,8 @@
10524
@@ -323,18 +352,28 @@
10526
install-dvi: install-dvi-am
10532
install-html: install-html-am
10536
install-info: install-info-am
10542
install-pdf: install-pdf-am
10546
install-ps: install-ps-am
10552
maintainer-clean: maintainer-clean-am
10553
@@ -368,6 +407,7 @@
10554
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
10555
uninstall-am uninstall-iconDATA
10558
# Tell versions [3.59,3.63) of GNU make to not export all variables.
10559
# Otherwise a system limit (for SysV at least) may be exceeded.
10561
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/24x24/stock/data/Makefile.in gnome-icon-theme-2.27.90.new/24x24/stock/data/Makefile.in
10562
--- gnome-icon-theme-2.27.90/24x24/stock/data/Makefile.in 2009-08-13 03:45:44.000000000 +0200
10563
+++ gnome-icon-theme-2.27.90.new/24x24/stock/data/Makefile.in 2009-08-27 12:38:28.000000000 +0200
10565
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
10566
+# Makefile.in generated by automake 1.11 from Makefile.am.
10567
# @configure_input@
10569
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
10570
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
10571
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
10573
# This Makefile.in is free software; the Free Software Foundation
10574
# gives unlimited permission to copy and/or distribute it,
10575
# with or without modifications, as long as this notice is preserved.
10579
pkgdatadir = $(datadir)/@PACKAGE@
10580
-pkglibdir = $(libdir)/@PACKAGE@
10581
pkgincludedir = $(includedir)/@PACKAGE@
10582
+pkglibdir = $(libdir)/@PACKAGE@
10583
+pkglibexecdir = $(libexecdir)/@PACKAGE@
10584
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
10585
install_sh_DATA = $(install_sh) -c -m 644
10586
install_sh_PROGRAM = $(install_sh) -c
10589
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
10590
CONFIG_CLEAN_FILES =
10591
+CONFIG_CLEAN_VPATH_FILES =
10594
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
10596
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
10599
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
10600
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
10601
+am__install_max = 40
10602
+am__nobase_strip_setup = \
10603
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
10604
+am__nobase_strip = \
10605
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
10606
+am__nobase_list = $(am__nobase_strip_setup); \
10607
+ for p in $$list; do echo "$$p $$p"; done | \
10608
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
10609
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
10610
+ if (++n[$$2] == $(am__install_max)) \
10611
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
10612
+ END { for (dir in files) print dir, files[dir] }'
10614
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
10615
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
10616
am__installdirs = "$(DESTDIR)$(icondir)"
10617
-iconDATA_INSTALL = $(INSTALL_DATA)
10618
DATA = $(icon_DATA)
10619
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
10620
ACLOCAL = @ACLOCAL@
10621
@@ -106,6 +123,7 @@
10622
PACKAGE_NAME = @PACKAGE_NAME@
10623
PACKAGE_STRING = @PACKAGE_STRING@
10624
PACKAGE_TARNAME = @PACKAGE_TARNAME@
10625
+PACKAGE_URL = @PACKAGE_URL@
10626
PACKAGE_VERSION = @PACKAGE_VERSION@
10627
PATH_SEPARATOR = @PATH_SEPARATOR@
10628
PKG_CONFIG = @PKG_CONFIG@
10629
@@ -225,9 +243,9 @@
10633
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/stock/data/Makefile'; \
10634
- cd $(top_srcdir) && \
10635
- $(AUTOMAKE) --gnu 24x24/stock/data/Makefile
10636
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/stock/data/Makefile'; \
10637
+ $(am__cd) $(top_srcdir) && \
10638
+ $(AUTOMAKE) --gnu 24x24/stock/data/Makefile
10639
.PRECIOUS: Makefile
10640
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
10642
@@ -245,23 +263,27 @@
10643
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
10644
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
10645
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
10646
+$(am__aclocal_m4_deps):
10647
install-iconDATA: $(icon_DATA)
10649
test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
10650
- @list='$(icon_DATA)'; for p in $$list; do \
10651
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
10652
+ for p in $$list; do \
10653
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
10654
- f=$(am__strip_dir) \
10655
- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
10656
- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
10658
+ done | $(am__base_list) | \
10659
+ while read files; do \
10660
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
10661
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
10664
uninstall-iconDATA:
10665
@$(NORMAL_UNINSTALL)
10666
- @list='$(icon_DATA)'; for p in $$list; do \
10667
- f=$(am__strip_dir) \
10668
- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
10669
- rm -f "$(DESTDIR)$(icondir)/$$f"; \
10671
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
10672
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
10673
+ test -n "$$files" || exit 0; \
10674
+ echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
10675
+ cd "$(DESTDIR)$(icondir)" && rm -f $$files
10679
@@ -285,13 +307,17 @@
10680
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
10681
if test -d $$d/$$file; then \
10682
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
10683
+ if test -d "$(distdir)/$$file"; then \
10684
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
10686
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
10687
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
10688
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
10689
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
10691
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
10692
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
10694
- test -f $(distdir)/$$file \
10695
- || cp -p $$d/$$file $(distdir)/$$file \
10696
+ test -f "$(distdir)/$$file" \
10697
+ || cp -p $$d/$$file "$(distdir)/$$file" \
10701
@@ -322,6 +348,7 @@
10704
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
10705
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
10707
maintainer-clean-generic:
10708
@echo "This command is intended for maintainers to use"
10709
@@ -340,6 +367,8 @@
10718
@@ -348,18 +377,28 @@
10720
install-dvi: install-dvi-am
10726
install-html: install-html-am
10730
install-info: install-info-am
10736
install-pdf: install-pdf-am
10740
install-ps: install-ps-am
10746
maintainer-clean: maintainer-clean-am
10747
@@ -393,6 +432,7 @@
10748
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
10749
uninstall-am uninstall-iconDATA
10752
# Tell versions [3.59,3.63) of GNU make to not export all variables.
10753
# Otherwise a system limit (for SysV at least) may be exceeded.
10755
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/24x24/stock/document/Makefile.in gnome-icon-theme-2.27.90.new/24x24/stock/document/Makefile.in
10756
--- gnome-icon-theme-2.27.90/24x24/stock/document/Makefile.in 2009-08-13 03:45:44.000000000 +0200
10757
+++ gnome-icon-theme-2.27.90.new/24x24/stock/document/Makefile.in 2009-08-27 12:38:28.000000000 +0200
10759
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
10760
+# Makefile.in generated by automake 1.11 from Makefile.am.
10761
# @configure_input@
10763
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
10764
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
10765
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
10767
# This Makefile.in is free software; the Free Software Foundation
10768
# gives unlimited permission to copy and/or distribute it,
10769
# with or without modifications, as long as this notice is preserved.
10773
pkgdatadir = $(datadir)/@PACKAGE@
10774
-pkglibdir = $(libdir)/@PACKAGE@
10775
pkgincludedir = $(includedir)/@PACKAGE@
10776
+pkglibdir = $(libdir)/@PACKAGE@
10777
+pkglibexecdir = $(libexecdir)/@PACKAGE@
10778
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
10779
install_sh_DATA = $(install_sh) -c -m 644
10780
install_sh_PROGRAM = $(install_sh) -c
10783
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
10784
CONFIG_CLEAN_FILES =
10785
+CONFIG_CLEAN_VPATH_FILES =
10788
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
10790
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
10793
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
10794
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
10795
+am__install_max = 40
10796
+am__nobase_strip_setup = \
10797
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
10798
+am__nobase_strip = \
10799
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
10800
+am__nobase_list = $(am__nobase_strip_setup); \
10801
+ for p in $$list; do echo "$$p $$p"; done | \
10802
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
10803
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
10804
+ if (++n[$$2] == $(am__install_max)) \
10805
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
10806
+ END { for (dir in files) print dir, files[dir] }'
10808
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
10809
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
10810
am__installdirs = "$(DESTDIR)$(icondir)"
10811
-iconDATA_INSTALL = $(INSTALL_DATA)
10812
DATA = $(icon_DATA)
10813
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
10814
ACLOCAL = @ACLOCAL@
10815
@@ -106,6 +123,7 @@
10816
PACKAGE_NAME = @PACKAGE_NAME@
10817
PACKAGE_STRING = @PACKAGE_STRING@
10818
PACKAGE_TARNAME = @PACKAGE_TARNAME@
10819
+PACKAGE_URL = @PACKAGE_URL@
10820
PACKAGE_VERSION = @PACKAGE_VERSION@
10821
PATH_SEPARATOR = @PATH_SEPARATOR@
10822
PKG_CONFIG = @PKG_CONFIG@
10823
@@ -205,9 +223,9 @@
10827
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/stock/document/Makefile'; \
10828
- cd $(top_srcdir) && \
10829
- $(AUTOMAKE) --gnu 24x24/stock/document/Makefile
10830
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/stock/document/Makefile'; \
10831
+ $(am__cd) $(top_srcdir) && \
10832
+ $(AUTOMAKE) --gnu 24x24/stock/document/Makefile
10833
.PRECIOUS: Makefile
10834
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
10836
@@ -225,23 +243,27 @@
10837
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
10838
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
10839
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
10840
+$(am__aclocal_m4_deps):
10841
install-iconDATA: $(icon_DATA)
10843
test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
10844
- @list='$(icon_DATA)'; for p in $$list; do \
10845
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
10846
+ for p in $$list; do \
10847
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
10848
- f=$(am__strip_dir) \
10849
- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
10850
- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
10852
+ done | $(am__base_list) | \
10853
+ while read files; do \
10854
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
10855
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
10858
uninstall-iconDATA:
10859
@$(NORMAL_UNINSTALL)
10860
- @list='$(icon_DATA)'; for p in $$list; do \
10861
- f=$(am__strip_dir) \
10862
- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
10863
- rm -f "$(DESTDIR)$(icondir)/$$f"; \
10865
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
10866
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
10867
+ test -n "$$files" || exit 0; \
10868
+ echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
10869
+ cd "$(DESTDIR)$(icondir)" && rm -f $$files
10873
@@ -265,13 +287,17 @@
10874
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
10875
if test -d $$d/$$file; then \
10876
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
10877
+ if test -d "$(distdir)/$$file"; then \
10878
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
10880
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
10881
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
10882
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
10883
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
10885
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
10886
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
10888
- test -f $(distdir)/$$file \
10889
- || cp -p $$d/$$file $(distdir)/$$file \
10890
+ test -f "$(distdir)/$$file" \
10891
+ || cp -p $$d/$$file "$(distdir)/$$file" \
10895
@@ -302,6 +328,7 @@
10898
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
10899
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
10901
maintainer-clean-generic:
10902
@echo "This command is intended for maintainers to use"
10903
@@ -320,6 +347,8 @@
10912
@@ -328,18 +357,28 @@
10914
install-dvi: install-dvi-am
10920
install-html: install-html-am
10924
install-info: install-info-am
10930
install-pdf: install-pdf-am
10934
install-ps: install-ps-am
10940
maintainer-clean: maintainer-clean-am
10941
@@ -373,6 +412,7 @@
10942
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
10943
uninstall-am uninstall-iconDATA
10946
# Tell versions [3.59,3.63) of GNU make to not export all variables.
10947
# Otherwise a system limit (for SysV at least) may be exceeded.
10949
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/24x24/stock/form/Makefile.in gnome-icon-theme-2.27.90.new/24x24/stock/form/Makefile.in
10950
--- gnome-icon-theme-2.27.90/24x24/stock/form/Makefile.in 2009-08-13 03:45:44.000000000 +0200
10951
+++ gnome-icon-theme-2.27.90.new/24x24/stock/form/Makefile.in 2009-08-27 12:38:28.000000000 +0200
10953
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
10954
+# Makefile.in generated by automake 1.11 from Makefile.am.
10955
# @configure_input@
10957
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
10958
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
10959
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
10961
# This Makefile.in is free software; the Free Software Foundation
10962
# gives unlimited permission to copy and/or distribute it,
10963
# with or without modifications, as long as this notice is preserved.
10967
pkgdatadir = $(datadir)/@PACKAGE@
10968
-pkglibdir = $(libdir)/@PACKAGE@
10969
pkgincludedir = $(includedir)/@PACKAGE@
10970
+pkglibdir = $(libdir)/@PACKAGE@
10971
+pkglibexecdir = $(libexecdir)/@PACKAGE@
10972
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
10973
install_sh_DATA = $(install_sh) -c -m 644
10974
install_sh_PROGRAM = $(install_sh) -c
10977
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
10978
CONFIG_CLEAN_FILES =
10979
+CONFIG_CLEAN_VPATH_FILES =
10982
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
10984
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
10987
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
10988
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
10989
+am__install_max = 40
10990
+am__nobase_strip_setup = \
10991
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
10992
+am__nobase_strip = \
10993
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
10994
+am__nobase_list = $(am__nobase_strip_setup); \
10995
+ for p in $$list; do echo "$$p $$p"; done | \
10996
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
10997
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
10998
+ if (++n[$$2] == $(am__install_max)) \
10999
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
11000
+ END { for (dir in files) print dir, files[dir] }'
11002
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
11003
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
11004
am__installdirs = "$(DESTDIR)$(icondir)"
11005
-iconDATA_INSTALL = $(INSTALL_DATA)
11006
DATA = $(icon_DATA)
11007
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
11008
ACLOCAL = @ACLOCAL@
11009
@@ -106,6 +123,7 @@
11010
PACKAGE_NAME = @PACKAGE_NAME@
11011
PACKAGE_STRING = @PACKAGE_STRING@
11012
PACKAGE_TARNAME = @PACKAGE_TARNAME@
11013
+PACKAGE_URL = @PACKAGE_URL@
11014
PACKAGE_VERSION = @PACKAGE_VERSION@
11015
PATH_SEPARATOR = @PATH_SEPARATOR@
11016
PKG_CONFIG = @PKG_CONFIG@
11017
@@ -219,9 +237,9 @@
11021
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/stock/form/Makefile'; \
11022
- cd $(top_srcdir) && \
11023
- $(AUTOMAKE) --gnu 24x24/stock/form/Makefile
11024
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/stock/form/Makefile'; \
11025
+ $(am__cd) $(top_srcdir) && \
11026
+ $(AUTOMAKE) --gnu 24x24/stock/form/Makefile
11027
.PRECIOUS: Makefile
11028
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
11030
@@ -239,23 +257,27 @@
11031
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
11032
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
11033
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
11034
+$(am__aclocal_m4_deps):
11035
install-iconDATA: $(icon_DATA)
11037
test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
11038
- @list='$(icon_DATA)'; for p in $$list; do \
11039
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
11040
+ for p in $$list; do \
11041
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
11042
- f=$(am__strip_dir) \
11043
- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
11044
- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
11046
+ done | $(am__base_list) | \
11047
+ while read files; do \
11048
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
11049
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
11052
uninstall-iconDATA:
11053
@$(NORMAL_UNINSTALL)
11054
- @list='$(icon_DATA)'; for p in $$list; do \
11055
- f=$(am__strip_dir) \
11056
- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
11057
- rm -f "$(DESTDIR)$(icondir)/$$f"; \
11059
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
11060
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
11061
+ test -n "$$files" || exit 0; \
11062
+ echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
11063
+ cd "$(DESTDIR)$(icondir)" && rm -f $$files
11067
@@ -279,13 +301,17 @@
11068
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
11069
if test -d $$d/$$file; then \
11070
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
11071
+ if test -d "$(distdir)/$$file"; then \
11072
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
11074
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
11075
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
11076
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
11077
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
11079
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
11080
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
11082
- test -f $(distdir)/$$file \
11083
- || cp -p $$d/$$file $(distdir)/$$file \
11084
+ test -f "$(distdir)/$$file" \
11085
+ || cp -p $$d/$$file "$(distdir)/$$file" \
11089
@@ -316,6 +342,7 @@
11092
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
11093
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
11095
maintainer-clean-generic:
11096
@echo "This command is intended for maintainers to use"
11097
@@ -334,6 +361,8 @@
11106
@@ -342,18 +371,28 @@
11108
install-dvi: install-dvi-am
11114
install-html: install-html-am
11118
install-info: install-info-am
11124
install-pdf: install-pdf-am
11128
install-ps: install-ps-am
11134
maintainer-clean: maintainer-clean-am
11135
@@ -387,6 +426,7 @@
11136
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
11137
uninstall-am uninstall-iconDATA
11140
# Tell versions [3.59,3.63) of GNU make to not export all variables.
11141
# Otherwise a system limit (for SysV at least) may be exceeded.
11143
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/24x24/stock/generic/Makefile.in gnome-icon-theme-2.27.90.new/24x24/stock/generic/Makefile.in
11144
--- gnome-icon-theme-2.27.90/24x24/stock/generic/Makefile.in 2009-08-13 03:45:44.000000000 +0200
11145
+++ gnome-icon-theme-2.27.90.new/24x24/stock/generic/Makefile.in 2009-08-27 12:38:28.000000000 +0200
11147
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
11148
+# Makefile.in generated by automake 1.11 from Makefile.am.
11149
# @configure_input@
11151
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
11152
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
11153
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
11155
# This Makefile.in is free software; the Free Software Foundation
11156
# gives unlimited permission to copy and/or distribute it,
11157
# with or without modifications, as long as this notice is preserved.
11161
pkgdatadir = $(datadir)/@PACKAGE@
11162
-pkglibdir = $(libdir)/@PACKAGE@
11163
pkgincludedir = $(includedir)/@PACKAGE@
11164
+pkglibdir = $(libdir)/@PACKAGE@
11165
+pkglibexecdir = $(libexecdir)/@PACKAGE@
11166
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
11167
install_sh_DATA = $(install_sh) -c -m 644
11168
install_sh_PROGRAM = $(install_sh) -c
11171
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
11172
CONFIG_CLEAN_FILES =
11173
+CONFIG_CLEAN_VPATH_FILES =
11176
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
11178
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
11181
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
11182
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
11183
+am__install_max = 40
11184
+am__nobase_strip_setup = \
11185
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
11186
+am__nobase_strip = \
11187
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
11188
+am__nobase_list = $(am__nobase_strip_setup); \
11189
+ for p in $$list; do echo "$$p $$p"; done | \
11190
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
11191
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
11192
+ if (++n[$$2] == $(am__install_max)) \
11193
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
11194
+ END { for (dir in files) print dir, files[dir] }'
11196
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
11197
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
11198
am__installdirs = "$(DESTDIR)$(icondir)"
11199
-iconDATA_INSTALL = $(INSTALL_DATA)
11200
DATA = $(icon_DATA)
11201
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
11202
ACLOCAL = @ACLOCAL@
11203
@@ -106,6 +123,7 @@
11204
PACKAGE_NAME = @PACKAGE_NAME@
11205
PACKAGE_STRING = @PACKAGE_STRING@
11206
PACKAGE_TARNAME = @PACKAGE_TARNAME@
11207
+PACKAGE_URL = @PACKAGE_URL@
11208
PACKAGE_VERSION = @PACKAGE_VERSION@
11209
PATH_SEPARATOR = @PATH_SEPARATOR@
11210
PKG_CONFIG = @PKG_CONFIG@
11211
@@ -249,9 +267,9 @@
11215
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/stock/generic/Makefile'; \
11216
- cd $(top_srcdir) && \
11217
- $(AUTOMAKE) --gnu 24x24/stock/generic/Makefile
11218
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/stock/generic/Makefile'; \
11219
+ $(am__cd) $(top_srcdir) && \
11220
+ $(AUTOMAKE) --gnu 24x24/stock/generic/Makefile
11221
.PRECIOUS: Makefile
11222
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
11224
@@ -269,23 +287,27 @@
11225
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
11226
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
11227
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
11228
+$(am__aclocal_m4_deps):
11229
install-iconDATA: $(icon_DATA)
11231
test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
11232
- @list='$(icon_DATA)'; for p in $$list; do \
11233
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
11234
+ for p in $$list; do \
11235
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
11236
- f=$(am__strip_dir) \
11237
- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
11238
- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
11240
+ done | $(am__base_list) | \
11241
+ while read files; do \
11242
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
11243
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
11246
uninstall-iconDATA:
11247
@$(NORMAL_UNINSTALL)
11248
- @list='$(icon_DATA)'; for p in $$list; do \
11249
- f=$(am__strip_dir) \
11250
- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
11251
- rm -f "$(DESTDIR)$(icondir)/$$f"; \
11253
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
11254
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
11255
+ test -n "$$files" || exit 0; \
11256
+ echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
11257
+ cd "$(DESTDIR)$(icondir)" && rm -f $$files
11261
@@ -309,13 +331,17 @@
11262
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
11263
if test -d $$d/$$file; then \
11264
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
11265
+ if test -d "$(distdir)/$$file"; then \
11266
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
11268
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
11269
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
11270
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
11271
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
11273
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
11274
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
11276
- test -f $(distdir)/$$file \
11277
- || cp -p $$d/$$file $(distdir)/$$file \
11278
+ test -f "$(distdir)/$$file" \
11279
+ || cp -p $$d/$$file "$(distdir)/$$file" \
11283
@@ -346,6 +372,7 @@
11286
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
11287
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
11289
maintainer-clean-generic:
11290
@echo "This command is intended for maintainers to use"
11291
@@ -364,6 +391,8 @@
11300
@@ -372,18 +401,28 @@
11302
install-dvi: install-dvi-am
11308
install-html: install-html-am
11312
install-info: install-info-am
11318
install-pdf: install-pdf-am
11322
install-ps: install-ps-am
11328
maintainer-clean: maintainer-clean-am
11329
@@ -417,6 +456,7 @@
11330
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
11331
uninstall-am uninstall-iconDATA
11334
# Tell versions [3.59,3.63) of GNU make to not export all variables.
11335
# Otherwise a system limit (for SysV at least) may be exceeded.
11337
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/24x24/stock/image/Makefile.in gnome-icon-theme-2.27.90.new/24x24/stock/image/Makefile.in
11338
--- gnome-icon-theme-2.27.90/24x24/stock/image/Makefile.in 2009-08-13 03:45:45.000000000 +0200
11339
+++ gnome-icon-theme-2.27.90.new/24x24/stock/image/Makefile.in 2009-08-27 12:38:28.000000000 +0200
11341
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
11342
+# Makefile.in generated by automake 1.11 from Makefile.am.
11343
# @configure_input@
11345
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
11346
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
11347
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
11349
# This Makefile.in is free software; the Free Software Foundation
11350
# gives unlimited permission to copy and/or distribute it,
11351
# with or without modifications, as long as this notice is preserved.
11355
pkgdatadir = $(datadir)/@PACKAGE@
11356
-pkglibdir = $(libdir)/@PACKAGE@
11357
pkgincludedir = $(includedir)/@PACKAGE@
11358
+pkglibdir = $(libdir)/@PACKAGE@
11359
+pkglibexecdir = $(libexecdir)/@PACKAGE@
11360
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
11361
install_sh_DATA = $(install_sh) -c -m 644
11362
install_sh_PROGRAM = $(install_sh) -c
11365
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
11366
CONFIG_CLEAN_FILES =
11367
+CONFIG_CLEAN_VPATH_FILES =
11370
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
11372
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
11375
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
11376
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
11377
+am__install_max = 40
11378
+am__nobase_strip_setup = \
11379
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
11380
+am__nobase_strip = \
11381
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
11382
+am__nobase_list = $(am__nobase_strip_setup); \
11383
+ for p in $$list; do echo "$$p $$p"; done | \
11384
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
11385
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
11386
+ if (++n[$$2] == $(am__install_max)) \
11387
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
11388
+ END { for (dir in files) print dir, files[dir] }'
11390
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
11391
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
11392
am__installdirs = "$(DESTDIR)$(icondir)"
11393
-iconDATA_INSTALL = $(INSTALL_DATA)
11394
DATA = $(icon_DATA)
11395
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
11396
ACLOCAL = @ACLOCAL@
11397
@@ -106,6 +123,7 @@
11398
PACKAGE_NAME = @PACKAGE_NAME@
11399
PACKAGE_STRING = @PACKAGE_STRING@
11400
PACKAGE_TARNAME = @PACKAGE_TARNAME@
11401
+PACKAGE_URL = @PACKAGE_URL@
11402
PACKAGE_VERSION = @PACKAGE_VERSION@
11403
PATH_SEPARATOR = @PATH_SEPARATOR@
11404
PKG_CONFIG = @PKG_CONFIG@
11405
@@ -321,9 +339,9 @@
11409
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/stock/image/Makefile'; \
11410
- cd $(top_srcdir) && \
11411
- $(AUTOMAKE) --gnu 24x24/stock/image/Makefile
11412
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/stock/image/Makefile'; \
11413
+ $(am__cd) $(top_srcdir) && \
11414
+ $(AUTOMAKE) --gnu 24x24/stock/image/Makefile
11415
.PRECIOUS: Makefile
11416
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
11418
@@ -341,23 +359,27 @@
11419
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
11420
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
11421
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
11422
+$(am__aclocal_m4_deps):
11423
install-iconDATA: $(icon_DATA)
11425
test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
11426
- @list='$(icon_DATA)'; for p in $$list; do \
11427
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
11428
+ for p in $$list; do \
11429
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
11430
- f=$(am__strip_dir) \
11431
- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
11432
- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
11434
+ done | $(am__base_list) | \
11435
+ while read files; do \
11436
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
11437
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
11440
uninstall-iconDATA:
11441
@$(NORMAL_UNINSTALL)
11442
- @list='$(icon_DATA)'; for p in $$list; do \
11443
- f=$(am__strip_dir) \
11444
- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
11445
- rm -f "$(DESTDIR)$(icondir)/$$f"; \
11447
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
11448
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
11449
+ test -n "$$files" || exit 0; \
11450
+ echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
11451
+ cd "$(DESTDIR)$(icondir)" && rm -f $$files
11455
@@ -381,13 +403,17 @@
11456
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
11457
if test -d $$d/$$file; then \
11458
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
11459
+ if test -d "$(distdir)/$$file"; then \
11460
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
11462
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
11463
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
11464
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
11465
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
11467
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
11468
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
11470
- test -f $(distdir)/$$file \
11471
- || cp -p $$d/$$file $(distdir)/$$file \
11472
+ test -f "$(distdir)/$$file" \
11473
+ || cp -p $$d/$$file "$(distdir)/$$file" \
11477
@@ -418,6 +444,7 @@
11480
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
11481
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
11483
maintainer-clean-generic:
11484
@echo "This command is intended for maintainers to use"
11485
@@ -436,6 +463,8 @@
11494
@@ -444,18 +473,28 @@
11496
install-dvi: install-dvi-am
11502
install-html: install-html-am
11506
install-info: install-info-am
11512
install-pdf: install-pdf-am
11516
install-ps: install-ps-am
11522
maintainer-clean: maintainer-clean-am
11523
@@ -489,6 +528,7 @@
11524
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
11525
uninstall-am uninstall-iconDATA
11528
# Tell versions [3.59,3.63) of GNU make to not export all variables.
11529
# Otherwise a system limit (for SysV at least) may be exceeded.
11531
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/24x24/stock/io/Makefile.in gnome-icon-theme-2.27.90.new/24x24/stock/io/Makefile.in
11532
--- gnome-icon-theme-2.27.90/24x24/stock/io/Makefile.in 2009-08-13 03:45:45.000000000 +0200
11533
+++ gnome-icon-theme-2.27.90.new/24x24/stock/io/Makefile.in 2009-08-27 12:38:29.000000000 +0200
11535
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
11536
+# Makefile.in generated by automake 1.11 from Makefile.am.
11537
# @configure_input@
11539
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
11540
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
11541
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
11543
# This Makefile.in is free software; the Free Software Foundation
11544
# gives unlimited permission to copy and/or distribute it,
11545
# with or without modifications, as long as this notice is preserved.
11549
pkgdatadir = $(datadir)/@PACKAGE@
11550
-pkglibdir = $(libdir)/@PACKAGE@
11551
pkgincludedir = $(includedir)/@PACKAGE@
11552
+pkglibdir = $(libdir)/@PACKAGE@
11553
+pkglibexecdir = $(libexecdir)/@PACKAGE@
11554
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
11555
install_sh_DATA = $(install_sh) -c -m 644
11556
install_sh_PROGRAM = $(install_sh) -c
11559
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
11560
CONFIG_CLEAN_FILES =
11561
+CONFIG_CLEAN_VPATH_FILES =
11564
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
11566
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
11569
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
11570
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
11571
+am__install_max = 40
11572
+am__nobase_strip_setup = \
11573
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
11574
+am__nobase_strip = \
11575
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
11576
+am__nobase_list = $(am__nobase_strip_setup); \
11577
+ for p in $$list; do echo "$$p $$p"; done | \
11578
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
11579
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
11580
+ if (++n[$$2] == $(am__install_max)) \
11581
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
11582
+ END { for (dir in files) print dir, files[dir] }'
11584
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
11585
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
11586
am__installdirs = "$(DESTDIR)$(icondir)"
11587
-iconDATA_INSTALL = $(INSTALL_DATA)
11588
DATA = $(icon_DATA)
11589
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
11590
ACLOCAL = @ACLOCAL@
11591
@@ -106,6 +123,7 @@
11592
PACKAGE_NAME = @PACKAGE_NAME@
11593
PACKAGE_STRING = @PACKAGE_STRING@
11594
PACKAGE_TARNAME = @PACKAGE_TARNAME@
11595
+PACKAGE_URL = @PACKAGE_URL@
11596
PACKAGE_VERSION = @PACKAGE_VERSION@
11597
PATH_SEPARATOR = @PATH_SEPARATOR@
11598
PKG_CONFIG = @PKG_CONFIG@
11599
@@ -193,9 +211,9 @@
11603
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/stock/io/Makefile'; \
11604
- cd $(top_srcdir) && \
11605
- $(AUTOMAKE) --gnu 24x24/stock/io/Makefile
11606
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/stock/io/Makefile'; \
11607
+ $(am__cd) $(top_srcdir) && \
11608
+ $(AUTOMAKE) --gnu 24x24/stock/io/Makefile
11609
.PRECIOUS: Makefile
11610
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
11612
@@ -213,23 +231,27 @@
11613
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
11614
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
11615
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
11616
+$(am__aclocal_m4_deps):
11617
install-iconDATA: $(icon_DATA)
11619
test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
11620
- @list='$(icon_DATA)'; for p in $$list; do \
11621
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
11622
+ for p in $$list; do \
11623
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
11624
- f=$(am__strip_dir) \
11625
- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
11626
- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
11628
+ done | $(am__base_list) | \
11629
+ while read files; do \
11630
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
11631
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
11634
uninstall-iconDATA:
11635
@$(NORMAL_UNINSTALL)
11636
- @list='$(icon_DATA)'; for p in $$list; do \
11637
- f=$(am__strip_dir) \
11638
- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
11639
- rm -f "$(DESTDIR)$(icondir)/$$f"; \
11641
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
11642
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
11643
+ test -n "$$files" || exit 0; \
11644
+ echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
11645
+ cd "$(DESTDIR)$(icondir)" && rm -f $$files
11649
@@ -253,13 +275,17 @@
11650
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
11651
if test -d $$d/$$file; then \
11652
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
11653
+ if test -d "$(distdir)/$$file"; then \
11654
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
11656
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
11657
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
11658
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
11659
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
11661
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
11662
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
11664
- test -f $(distdir)/$$file \
11665
- || cp -p $$d/$$file $(distdir)/$$file \
11666
+ test -f "$(distdir)/$$file" \
11667
+ || cp -p $$d/$$file "$(distdir)/$$file" \
11671
@@ -290,6 +316,7 @@
11674
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
11675
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
11677
maintainer-clean-generic:
11678
@echo "This command is intended for maintainers to use"
11679
@@ -308,6 +335,8 @@
11688
@@ -316,18 +345,28 @@
11690
install-dvi: install-dvi-am
11696
install-html: install-html-am
11700
install-info: install-info-am
11706
install-pdf: install-pdf-am
11710
install-ps: install-ps-am
11716
maintainer-clean: maintainer-clean-am
11717
@@ -361,6 +400,7 @@
11718
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
11719
uninstall-am uninstall-iconDATA
11722
# Tell versions [3.59,3.63) of GNU make to not export all variables.
11723
# Otherwise a system limit (for SysV at least) may be exceeded.
11725
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/24x24/stock/Makefile.in gnome-icon-theme-2.27.90.new/24x24/stock/Makefile.in
11726
--- gnome-icon-theme-2.27.90/24x24/stock/Makefile.in 2009-08-13 03:45:43.000000000 +0200
11727
+++ gnome-icon-theme-2.27.90.new/24x24/stock/Makefile.in 2009-08-27 12:38:28.000000000 +0200
11729
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
11730
+# Makefile.in generated by automake 1.11 from Makefile.am.
11731
# @configure_input@
11733
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
11734
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
11735
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
11737
# This Makefile.in is free software; the Free Software Foundation
11738
# gives unlimited permission to copy and/or distribute it,
11739
# with or without modifications, as long as this notice is preserved.
11743
pkgdatadir = $(datadir)/@PACKAGE@
11744
-pkglibdir = $(libdir)/@PACKAGE@
11745
pkgincludedir = $(includedir)/@PACKAGE@
11746
+pkglibdir = $(libdir)/@PACKAGE@
11747
+pkglibexecdir = $(libexecdir)/@PACKAGE@
11748
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
11749
install_sh_DATA = $(install_sh) -c -m 644
11750
install_sh_PROGRAM = $(install_sh) -c
11753
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
11754
CONFIG_CLEAN_FILES =
11755
+CONFIG_CLEAN_VPATH_FILES =
11758
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
11759
@@ -48,10 +51,38 @@
11760
ps-recursive uninstall-recursive
11761
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
11762
distclean-recursive maintainer-clean-recursive
11763
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
11764
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
11768
DIST_SUBDIRS = $(SUBDIRS)
11769
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
11770
+am__relativize = \
11772
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
11773
+ sed_rest='s,^[^/]*/*,,'; \
11774
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
11775
+ sed_butlast='s,/*[^/]*$$,,'; \
11776
+ while test -n "$$dir1"; do \
11777
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
11778
+ if test "$$first" != "."; then \
11779
+ if test "$$first" = ".."; then \
11780
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
11781
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
11783
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
11784
+ if test "$$first2" = "$$first"; then \
11785
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
11787
+ dir2="../$$dir2"; \
11789
+ dir0="$$dir0"/"$$first"; \
11792
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
11795
ACLOCAL = @ACLOCAL@
11796
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
11797
ALL_LINGUAS = @ALL_LINGUAS@
11798
@@ -108,6 +139,7 @@
11799
PACKAGE_NAME = @PACKAGE_NAME@
11800
PACKAGE_STRING = @PACKAGE_STRING@
11801
PACKAGE_TARNAME = @PACKAGE_TARNAME@
11802
+PACKAGE_URL = @PACKAGE_URL@
11803
PACKAGE_VERSION = @PACKAGE_VERSION@
11804
PATH_SEPARATOR = @PATH_SEPARATOR@
11805
PKG_CONFIG = @PKG_CONFIG@
11806
@@ -179,9 +211,9 @@
11810
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/stock/Makefile'; \
11811
- cd $(top_srcdir) && \
11812
- $(AUTOMAKE) --gnu 24x24/stock/Makefile
11813
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/stock/Makefile'; \
11814
+ $(am__cd) $(top_srcdir) && \
11815
+ $(AUTOMAKE) --gnu 24x24/stock/Makefile
11816
.PRECIOUS: Makefile
11817
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
11819
@@ -199,6 +231,7 @@
11820
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
11821
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
11822
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
11823
+$(am__aclocal_m4_deps):
11825
# This directory's subdirectories are mostly independent; you can cd
11826
# into them and run `make' without going through this Makefile.
11827
@@ -224,7 +257,7 @@
11829
local_target="$$target"; \
11831
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
11832
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
11833
|| eval $$failcom; \
11835
if test "$$dot_seen" = "no"; then \
11836
@@ -258,16 +291,16 @@
11838
local_target="$$target"; \
11840
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
11841
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
11842
|| eval $$failcom; \
11843
done && test -z "$$fail"
11845
list='$(SUBDIRS)'; for subdir in $$list; do \
11846
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
11847
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
11850
list='$(SUBDIRS)'; for subdir in $$list; do \
11851
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
11852
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
11855
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
11856
@@ -282,7 +315,7 @@
11858
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
11859
$(TAGS_FILES) $(LISP)
11863
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
11864
include_option=--etags-include; \
11865
@@ -294,7 +327,7 @@
11866
list='$(SUBDIRS)'; for subdir in $$list; do \
11867
if test "$$subdir" = .; then :; else \
11868
test ! -f $$subdir/TAGS || \
11869
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
11870
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
11873
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
11874
@@ -303,29 +336,34 @@
11876
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
11877
END { if (nonempty) { for (i in files) print i; }; }'`; \
11878
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
11880
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
11881
test -n "$$unique" || unique=$$empty_fix; \
11882
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
11883
- $$tags $$unique; \
11884
+ if test $$# -gt 0; then \
11885
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
11886
+ "$$@" $$unique; \
11888
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
11893
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
11894
$(TAGS_FILES) $(LISP)
11896
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
11897
unique=`for i in $$list; do \
11898
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
11900
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
11901
END { if (nonempty) { for (i in files) print i; }; }'`; \
11902
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
11903
+ test -z "$(CTAGS_ARGS)$$unique" \
11904
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
11909
here=`$(am__cd) $(top_builddir) && pwd` \
11910
- && cd $(top_srcdir) \
11911
- && gtags -i $(GTAGS_ARGS) $$here
11912
+ && $(am__cd) $(top_srcdir) \
11913
+ && gtags -i $(GTAGS_ARGS) "$$here"
11916
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
11917
@@ -346,29 +384,44 @@
11918
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
11919
if test -d $$d/$$file; then \
11920
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
11921
+ if test -d "$(distdir)/$$file"; then \
11922
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
11924
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
11925
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
11926
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
11927
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
11929
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
11930
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
11932
- test -f $(distdir)/$$file \
11933
- || cp -p $$d/$$file $(distdir)/$$file \
11934
+ test -f "$(distdir)/$$file" \
11935
+ || cp -p $$d/$$file "$(distdir)/$$file" \
11939
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
11940
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
11941
if test "$$subdir" = .; then :; else \
11942
test -d "$(distdir)/$$subdir" \
11943
|| $(MKDIR_P) "$(distdir)/$$subdir" \
11945
- distdir=`$(am__cd) $(distdir) && pwd`; \
11946
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
11947
- (cd $$subdir && \
11950
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
11951
+ if test "$$subdir" = .; then :; else \
11952
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
11953
+ $(am__relativize); \
11954
+ new_distdir=$$reldir; \
11955
+ dir1=$$subdir; dir2="$(top_distdir)"; \
11956
+ $(am__relativize); \
11957
+ new_top_distdir=$$reldir; \
11958
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
11959
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
11960
+ ($(am__cd) $$subdir && \
11961
$(MAKE) $(AM_MAKEFLAGS) \
11962
- top_distdir="$$top_distdir" \
11963
- distdir="$$distdir/$$subdir" \
11964
+ top_distdir="$$new_top_distdir" \
11965
+ distdir="$$new_distdir" \
11966
am__remove_distdir=: \
11967
am__skip_length_check=: \
11968
+ am__skip_mode_fix=: \
11972
@@ -398,6 +451,7 @@
11975
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
11976
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
11978
maintainer-clean-generic:
11979
@echo "This command is intended for maintainers to use"
11980
@@ -416,6 +470,8 @@
11982
html: html-recursive
11986
info: info-recursive
11989
@@ -424,18 +480,28 @@
11991
install-dvi: install-dvi-recursive
11997
install-html: install-html-recursive
12001
install-info: install-info-recursive
12007
install-pdf: install-pdf-recursive
12011
install-ps: install-ps-recursive
12017
maintainer-clean: maintainer-clean-recursive
12018
@@ -456,8 +522,8 @@
12022
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
12024
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
12025
+ install-am install-strip tags-recursive
12027
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
12028
all all-am check check-am clean clean-generic ctags \
12029
@@ -472,6 +538,7 @@
12030
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
12031
tags-recursive uninstall uninstall-am
12034
# Tell versions [3.59,3.63) of GNU make to not export all variables.
12035
# Otherwise a system limit (for SysV at least) may be exceeded.
12037
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/24x24/stock/media/Makefile.in gnome-icon-theme-2.27.90.new/24x24/stock/media/Makefile.in
12038
--- gnome-icon-theme-2.27.90/24x24/stock/media/Makefile.in 2009-08-13 03:45:45.000000000 +0200
12039
+++ gnome-icon-theme-2.27.90.new/24x24/stock/media/Makefile.in 2009-08-27 12:38:29.000000000 +0200
12041
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
12042
+# Makefile.in generated by automake 1.11 from Makefile.am.
12043
# @configure_input@
12045
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
12046
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
12047
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
12049
# This Makefile.in is free software; the Free Software Foundation
12050
# gives unlimited permission to copy and/or distribute it,
12051
# with or without modifications, as long as this notice is preserved.
12055
pkgdatadir = $(datadir)/@PACKAGE@
12056
-pkglibdir = $(libdir)/@PACKAGE@
12057
pkgincludedir = $(includedir)/@PACKAGE@
12058
+pkglibdir = $(libdir)/@PACKAGE@
12059
+pkglibexecdir = $(libexecdir)/@PACKAGE@
12060
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
12061
install_sh_DATA = $(install_sh) -c -m 644
12062
install_sh_PROGRAM = $(install_sh) -c
12065
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
12066
CONFIG_CLEAN_FILES =
12067
+CONFIG_CLEAN_VPATH_FILES =
12070
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
12072
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
12075
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
12076
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
12077
+am__install_max = 40
12078
+am__nobase_strip_setup = \
12079
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
12080
+am__nobase_strip = \
12081
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
12082
+am__nobase_list = $(am__nobase_strip_setup); \
12083
+ for p in $$list; do echo "$$p $$p"; done | \
12084
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
12085
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
12086
+ if (++n[$$2] == $(am__install_max)) \
12087
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
12088
+ END { for (dir in files) print dir, files[dir] }'
12090
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
12091
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
12092
am__installdirs = "$(DESTDIR)$(icondir)"
12093
-iconDATA_INSTALL = $(INSTALL_DATA)
12094
DATA = $(icon_DATA)
12095
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
12096
ACLOCAL = @ACLOCAL@
12097
@@ -106,6 +123,7 @@
12098
PACKAGE_NAME = @PACKAGE_NAME@
12099
PACKAGE_STRING = @PACKAGE_STRING@
12100
PACKAGE_TARNAME = @PACKAGE_TARNAME@
12101
+PACKAGE_URL = @PACKAGE_URL@
12102
PACKAGE_VERSION = @PACKAGE_VERSION@
12103
PATH_SEPARATOR = @PATH_SEPARATOR@
12104
PKG_CONFIG = @PKG_CONFIG@
12105
@@ -192,9 +210,9 @@
12109
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/stock/media/Makefile'; \
12110
- cd $(top_srcdir) && \
12111
- $(AUTOMAKE) --gnu 24x24/stock/media/Makefile
12112
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/stock/media/Makefile'; \
12113
+ $(am__cd) $(top_srcdir) && \
12114
+ $(AUTOMAKE) --gnu 24x24/stock/media/Makefile
12115
.PRECIOUS: Makefile
12116
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
12118
@@ -212,23 +230,27 @@
12119
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
12120
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
12121
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
12122
+$(am__aclocal_m4_deps):
12123
install-iconDATA: $(icon_DATA)
12125
test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
12126
- @list='$(icon_DATA)'; for p in $$list; do \
12127
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
12128
+ for p in $$list; do \
12129
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
12130
- f=$(am__strip_dir) \
12131
- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
12132
- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
12134
+ done | $(am__base_list) | \
12135
+ while read files; do \
12136
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
12137
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
12140
uninstall-iconDATA:
12141
@$(NORMAL_UNINSTALL)
12142
- @list='$(icon_DATA)'; for p in $$list; do \
12143
- f=$(am__strip_dir) \
12144
- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
12145
- rm -f "$(DESTDIR)$(icondir)/$$f"; \
12147
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
12148
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
12149
+ test -n "$$files" || exit 0; \
12150
+ echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
12151
+ cd "$(DESTDIR)$(icondir)" && rm -f $$files
12155
@@ -252,13 +274,17 @@
12156
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
12157
if test -d $$d/$$file; then \
12158
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
12159
+ if test -d "$(distdir)/$$file"; then \
12160
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
12162
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
12163
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
12164
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
12165
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
12167
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
12168
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
12170
- test -f $(distdir)/$$file \
12171
- || cp -p $$d/$$file $(distdir)/$$file \
12172
+ test -f "$(distdir)/$$file" \
12173
+ || cp -p $$d/$$file "$(distdir)/$$file" \
12177
@@ -289,6 +315,7 @@
12180
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
12181
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
12183
maintainer-clean-generic:
12184
@echo "This command is intended for maintainers to use"
12185
@@ -307,6 +334,8 @@
12194
@@ -315,18 +344,28 @@
12196
install-dvi: install-dvi-am
12202
install-html: install-html-am
12206
install-info: install-info-am
12212
install-pdf: install-pdf-am
12216
install-ps: install-ps-am
12222
maintainer-clean: maintainer-clean-am
12223
@@ -360,6 +399,7 @@
12224
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
12225
uninstall-am uninstall-iconDATA
12228
# Tell versions [3.59,3.63) of GNU make to not export all variables.
12229
# Otherwise a system limit (for SysV at least) may be exceeded.
12231
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/24x24/stock/navigation/Makefile.in gnome-icon-theme-2.27.90.new/24x24/stock/navigation/Makefile.in
12232
--- gnome-icon-theme-2.27.90/24x24/stock/navigation/Makefile.in 2009-08-13 03:45:45.000000000 +0200
12233
+++ gnome-icon-theme-2.27.90.new/24x24/stock/navigation/Makefile.in 2009-08-27 12:38:29.000000000 +0200
12235
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
12236
+# Makefile.in generated by automake 1.11 from Makefile.am.
12237
# @configure_input@
12239
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
12240
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
12241
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
12243
# This Makefile.in is free software; the Free Software Foundation
12244
# gives unlimited permission to copy and/or distribute it,
12245
# with or without modifications, as long as this notice is preserved.
12249
pkgdatadir = $(datadir)/@PACKAGE@
12250
-pkglibdir = $(libdir)/@PACKAGE@
12251
pkgincludedir = $(includedir)/@PACKAGE@
12252
+pkglibdir = $(libdir)/@PACKAGE@
12253
+pkglibexecdir = $(libexecdir)/@PACKAGE@
12254
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
12255
install_sh_DATA = $(install_sh) -c -m 644
12256
install_sh_PROGRAM = $(install_sh) -c
12259
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
12260
CONFIG_CLEAN_FILES =
12261
+CONFIG_CLEAN_VPATH_FILES =
12264
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
12266
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
12269
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
12270
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
12271
+am__install_max = 40
12272
+am__nobase_strip_setup = \
12273
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
12274
+am__nobase_strip = \
12275
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
12276
+am__nobase_list = $(am__nobase_strip_setup); \
12277
+ for p in $$list; do echo "$$p $$p"; done | \
12278
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
12279
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
12280
+ if (++n[$$2] == $(am__install_max)) \
12281
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
12282
+ END { for (dir in files) print dir, files[dir] }'
12284
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
12285
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
12286
am__installdirs = "$(DESTDIR)$(icondir)"
12287
-iconDATA_INSTALL = $(INSTALL_DATA)
12288
DATA = $(icon_DATA)
12289
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
12290
ACLOCAL = @ACLOCAL@
12291
@@ -106,6 +123,7 @@
12292
PACKAGE_NAME = @PACKAGE_NAME@
12293
PACKAGE_STRING = @PACKAGE_STRING@
12294
PACKAGE_TARNAME = @PACKAGE_TARNAME@
12295
+PACKAGE_URL = @PACKAGE_URL@
12296
PACKAGE_VERSION = @PACKAGE_VERSION@
12297
PATH_SEPARATOR = @PATH_SEPARATOR@
12298
PKG_CONFIG = @PKG_CONFIG@
12299
@@ -203,9 +221,9 @@
12303
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/stock/navigation/Makefile'; \
12304
- cd $(top_srcdir) && \
12305
- $(AUTOMAKE) --gnu 24x24/stock/navigation/Makefile
12306
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/stock/navigation/Makefile'; \
12307
+ $(am__cd) $(top_srcdir) && \
12308
+ $(AUTOMAKE) --gnu 24x24/stock/navigation/Makefile
12309
.PRECIOUS: Makefile
12310
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
12312
@@ -223,23 +241,27 @@
12313
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
12314
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
12315
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
12316
+$(am__aclocal_m4_deps):
12317
install-iconDATA: $(icon_DATA)
12319
test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
12320
- @list='$(icon_DATA)'; for p in $$list; do \
12321
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
12322
+ for p in $$list; do \
12323
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
12324
- f=$(am__strip_dir) \
12325
- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
12326
- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
12328
+ done | $(am__base_list) | \
12329
+ while read files; do \
12330
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
12331
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
12334
uninstall-iconDATA:
12335
@$(NORMAL_UNINSTALL)
12336
- @list='$(icon_DATA)'; for p in $$list; do \
12337
- f=$(am__strip_dir) \
12338
- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
12339
- rm -f "$(DESTDIR)$(icondir)/$$f"; \
12341
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
12342
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
12343
+ test -n "$$files" || exit 0; \
12344
+ echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
12345
+ cd "$(DESTDIR)$(icondir)" && rm -f $$files
12349
@@ -263,13 +285,17 @@
12350
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
12351
if test -d $$d/$$file; then \
12352
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
12353
+ if test -d "$(distdir)/$$file"; then \
12354
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
12356
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
12357
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
12358
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
12359
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
12361
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
12362
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
12364
- test -f $(distdir)/$$file \
12365
- || cp -p $$d/$$file $(distdir)/$$file \
12366
+ test -f "$(distdir)/$$file" \
12367
+ || cp -p $$d/$$file "$(distdir)/$$file" \
12371
@@ -300,6 +326,7 @@
12374
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
12375
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
12377
maintainer-clean-generic:
12378
@echo "This command is intended for maintainers to use"
12379
@@ -318,6 +345,8 @@
12388
@@ -326,18 +355,28 @@
12390
install-dvi: install-dvi-am
12396
install-html: install-html-am
12400
install-info: install-info-am
12406
install-pdf: install-pdf-am
12410
install-ps: install-ps-am
12416
maintainer-clean: maintainer-clean-am
12417
@@ -371,6 +410,7 @@
12418
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
12419
uninstall-am uninstall-iconDATA
12422
# Tell versions [3.59,3.63) of GNU make to not export all variables.
12423
# Otherwise a system limit (for SysV at least) may be exceeded.
12425
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/24x24/stock/net/Makefile.in gnome-icon-theme-2.27.90.new/24x24/stock/net/Makefile.in
12426
--- gnome-icon-theme-2.27.90/24x24/stock/net/Makefile.in 2009-08-13 03:45:45.000000000 +0200
12427
+++ gnome-icon-theme-2.27.90.new/24x24/stock/net/Makefile.in 2009-08-27 12:38:29.000000000 +0200
12429
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
12430
+# Makefile.in generated by automake 1.11 from Makefile.am.
12431
# @configure_input@
12433
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
12434
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
12435
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
12437
# This Makefile.in is free software; the Free Software Foundation
12438
# gives unlimited permission to copy and/or distribute it,
12439
# with or without modifications, as long as this notice is preserved.
12443
pkgdatadir = $(datadir)/@PACKAGE@
12444
-pkglibdir = $(libdir)/@PACKAGE@
12445
pkgincludedir = $(includedir)/@PACKAGE@
12446
+pkglibdir = $(libdir)/@PACKAGE@
12447
+pkglibexecdir = $(libexecdir)/@PACKAGE@
12448
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
12449
install_sh_DATA = $(install_sh) -c -m 644
12450
install_sh_PROGRAM = $(install_sh) -c
12453
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
12454
CONFIG_CLEAN_FILES =
12455
+CONFIG_CLEAN_VPATH_FILES =
12458
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
12460
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
12463
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
12464
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
12465
+am__install_max = 40
12466
+am__nobase_strip_setup = \
12467
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
12468
+am__nobase_strip = \
12469
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
12470
+am__nobase_list = $(am__nobase_strip_setup); \
12471
+ for p in $$list; do echo "$$p $$p"; done | \
12472
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
12473
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
12474
+ if (++n[$$2] == $(am__install_max)) \
12475
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
12476
+ END { for (dir in files) print dir, files[dir] }'
12478
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
12479
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
12480
am__installdirs = "$(DESTDIR)$(icondir)"
12481
-iconDATA_INSTALL = $(INSTALL_DATA)
12482
DATA = $(icon_DATA)
12483
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
12484
ACLOCAL = @ACLOCAL@
12485
@@ -106,6 +123,7 @@
12486
PACKAGE_NAME = @PACKAGE_NAME@
12487
PACKAGE_STRING = @PACKAGE_STRING@
12488
PACKAGE_TARNAME = @PACKAGE_TARNAME@
12489
+PACKAGE_URL = @PACKAGE_URL@
12490
PACKAGE_VERSION = @PACKAGE_VERSION@
12491
PATH_SEPARATOR = @PATH_SEPARATOR@
12492
PKG_CONFIG = @PKG_CONFIG@
12493
@@ -225,9 +243,9 @@
12497
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/stock/net/Makefile'; \
12498
- cd $(top_srcdir) && \
12499
- $(AUTOMAKE) --gnu 24x24/stock/net/Makefile
12500
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/stock/net/Makefile'; \
12501
+ $(am__cd) $(top_srcdir) && \
12502
+ $(AUTOMAKE) --gnu 24x24/stock/net/Makefile
12503
.PRECIOUS: Makefile
12504
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
12506
@@ -245,23 +263,27 @@
12507
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
12508
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
12509
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
12510
+$(am__aclocal_m4_deps):
12511
install-iconDATA: $(icon_DATA)
12513
test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
12514
- @list='$(icon_DATA)'; for p in $$list; do \
12515
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
12516
+ for p in $$list; do \
12517
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
12518
- f=$(am__strip_dir) \
12519
- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
12520
- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
12522
+ done | $(am__base_list) | \
12523
+ while read files; do \
12524
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
12525
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
12528
uninstall-iconDATA:
12529
@$(NORMAL_UNINSTALL)
12530
- @list='$(icon_DATA)'; for p in $$list; do \
12531
- f=$(am__strip_dir) \
12532
- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
12533
- rm -f "$(DESTDIR)$(icondir)/$$f"; \
12535
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
12536
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
12537
+ test -n "$$files" || exit 0; \
12538
+ echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
12539
+ cd "$(DESTDIR)$(icondir)" && rm -f $$files
12543
@@ -285,13 +307,17 @@
12544
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
12545
if test -d $$d/$$file; then \
12546
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
12547
+ if test -d "$(distdir)/$$file"; then \
12548
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
12550
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
12551
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
12552
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
12553
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
12555
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
12556
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
12558
- test -f $(distdir)/$$file \
12559
- || cp -p $$d/$$file $(distdir)/$$file \
12560
+ test -f "$(distdir)/$$file" \
12561
+ || cp -p $$d/$$file "$(distdir)/$$file" \
12565
@@ -322,6 +348,7 @@
12568
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
12569
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
12571
maintainer-clean-generic:
12572
@echo "This command is intended for maintainers to use"
12573
@@ -340,6 +367,8 @@
12582
@@ -348,18 +377,28 @@
12584
install-dvi: install-dvi-am
12590
install-html: install-html-am
12594
install-info: install-info-am
12600
install-pdf: install-pdf-am
12604
install-ps: install-ps-am
12610
maintainer-clean: maintainer-clean-am
12611
@@ -393,6 +432,7 @@
12612
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
12613
uninstall-am uninstall-iconDATA
12616
# Tell versions [3.59,3.63) of GNU make to not export all variables.
12617
# Otherwise a system limit (for SysV at least) may be exceeded.
12619
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/24x24/stock/object/Makefile.in gnome-icon-theme-2.27.90.new/24x24/stock/object/Makefile.in
12620
--- gnome-icon-theme-2.27.90/24x24/stock/object/Makefile.in 2009-08-13 03:45:46.000000000 +0200
12621
+++ gnome-icon-theme-2.27.90.new/24x24/stock/object/Makefile.in 2009-08-27 12:38:29.000000000 +0200
12623
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
12624
+# Makefile.in generated by automake 1.11 from Makefile.am.
12625
# @configure_input@
12627
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
12628
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
12629
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
12631
# This Makefile.in is free software; the Free Software Foundation
12632
# gives unlimited permission to copy and/or distribute it,
12633
# with or without modifications, as long as this notice is preserved.
12637
pkgdatadir = $(datadir)/@PACKAGE@
12638
-pkglibdir = $(libdir)/@PACKAGE@
12639
pkgincludedir = $(includedir)/@PACKAGE@
12640
+pkglibdir = $(libdir)/@PACKAGE@
12641
+pkglibexecdir = $(libexecdir)/@PACKAGE@
12642
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
12643
install_sh_DATA = $(install_sh) -c -m 644
12644
install_sh_PROGRAM = $(install_sh) -c
12647
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
12648
CONFIG_CLEAN_FILES =
12649
+CONFIG_CLEAN_VPATH_FILES =
12652
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
12654
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
12657
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
12658
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
12659
+am__install_max = 40
12660
+am__nobase_strip_setup = \
12661
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
12662
+am__nobase_strip = \
12663
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
12664
+am__nobase_list = $(am__nobase_strip_setup); \
12665
+ for p in $$list; do echo "$$p $$p"; done | \
12666
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
12667
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
12668
+ if (++n[$$2] == $(am__install_max)) \
12669
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
12670
+ END { for (dir in files) print dir, files[dir] }'
12672
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
12673
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
12674
am__installdirs = "$(DESTDIR)$(icondir)"
12675
-iconDATA_INSTALL = $(INSTALL_DATA)
12676
DATA = $(icon_DATA)
12677
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
12678
ACLOCAL = @ACLOCAL@
12679
@@ -106,6 +123,7 @@
12680
PACKAGE_NAME = @PACKAGE_NAME@
12681
PACKAGE_STRING = @PACKAGE_STRING@
12682
PACKAGE_TARNAME = @PACKAGE_TARNAME@
12683
+PACKAGE_URL = @PACKAGE_URL@
12684
PACKAGE_VERSION = @PACKAGE_VERSION@
12685
PATH_SEPARATOR = @PATH_SEPARATOR@
12686
PKG_CONFIG = @PKG_CONFIG@
12687
@@ -246,9 +264,9 @@
12691
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/stock/object/Makefile'; \
12692
- cd $(top_srcdir) && \
12693
- $(AUTOMAKE) --gnu 24x24/stock/object/Makefile
12694
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/stock/object/Makefile'; \
12695
+ $(am__cd) $(top_srcdir) && \
12696
+ $(AUTOMAKE) --gnu 24x24/stock/object/Makefile
12697
.PRECIOUS: Makefile
12698
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
12700
@@ -266,23 +284,27 @@
12701
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
12702
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
12703
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
12704
+$(am__aclocal_m4_deps):
12705
install-iconDATA: $(icon_DATA)
12707
test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
12708
- @list='$(icon_DATA)'; for p in $$list; do \
12709
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
12710
+ for p in $$list; do \
12711
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
12712
- f=$(am__strip_dir) \
12713
- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
12714
- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
12716
+ done | $(am__base_list) | \
12717
+ while read files; do \
12718
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
12719
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
12722
uninstall-iconDATA:
12723
@$(NORMAL_UNINSTALL)
12724
- @list='$(icon_DATA)'; for p in $$list; do \
12725
- f=$(am__strip_dir) \
12726
- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
12727
- rm -f "$(DESTDIR)$(icondir)/$$f"; \
12729
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
12730
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
12731
+ test -n "$$files" || exit 0; \
12732
+ echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
12733
+ cd "$(DESTDIR)$(icondir)" && rm -f $$files
12737
@@ -306,13 +328,17 @@
12738
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
12739
if test -d $$d/$$file; then \
12740
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
12741
+ if test -d "$(distdir)/$$file"; then \
12742
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
12744
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
12745
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
12746
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
12747
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
12749
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
12750
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
12752
- test -f $(distdir)/$$file \
12753
- || cp -p $$d/$$file $(distdir)/$$file \
12754
+ test -f "$(distdir)/$$file" \
12755
+ || cp -p $$d/$$file "$(distdir)/$$file" \
12759
@@ -343,6 +369,7 @@
12762
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
12763
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
12765
maintainer-clean-generic:
12766
@echo "This command is intended for maintainers to use"
12767
@@ -361,6 +388,8 @@
12776
@@ -369,18 +398,28 @@
12778
install-dvi: install-dvi-am
12784
install-html: install-html-am
12788
install-info: install-info-am
12794
install-pdf: install-pdf-am
12798
install-ps: install-ps-am
12804
maintainer-clean: maintainer-clean-am
12805
@@ -414,6 +453,7 @@
12806
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
12807
uninstall-am uninstall-iconDATA
12810
# Tell versions [3.59,3.63) of GNU make to not export all variables.
12811
# Otherwise a system limit (for SysV at least) may be exceeded.
12813
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/24x24/stock/table/Makefile.in gnome-icon-theme-2.27.90.new/24x24/stock/table/Makefile.in
12814
--- gnome-icon-theme-2.27.90/24x24/stock/table/Makefile.in 2009-08-13 03:45:46.000000000 +0200
12815
+++ gnome-icon-theme-2.27.90.new/24x24/stock/table/Makefile.in 2009-08-27 12:38:29.000000000 +0200
12817
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
12818
+# Makefile.in generated by automake 1.11 from Makefile.am.
12819
# @configure_input@
12821
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
12822
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
12823
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
12825
# This Makefile.in is free software; the Free Software Foundation
12826
# gives unlimited permission to copy and/or distribute it,
12827
# with or without modifications, as long as this notice is preserved.
12831
pkgdatadir = $(datadir)/@PACKAGE@
12832
-pkglibdir = $(libdir)/@PACKAGE@
12833
pkgincludedir = $(includedir)/@PACKAGE@
12834
+pkglibdir = $(libdir)/@PACKAGE@
12835
+pkglibexecdir = $(libexecdir)/@PACKAGE@
12836
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
12837
install_sh_DATA = $(install_sh) -c -m 644
12838
install_sh_PROGRAM = $(install_sh) -c
12841
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
12842
CONFIG_CLEAN_FILES =
12843
+CONFIG_CLEAN_VPATH_FILES =
12846
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
12848
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
12851
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
12852
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
12853
+am__install_max = 40
12854
+am__nobase_strip_setup = \
12855
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
12856
+am__nobase_strip = \
12857
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
12858
+am__nobase_list = $(am__nobase_strip_setup); \
12859
+ for p in $$list; do echo "$$p $$p"; done | \
12860
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
12861
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
12862
+ if (++n[$$2] == $(am__install_max)) \
12863
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
12864
+ END { for (dir in files) print dir, files[dir] }'
12866
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
12867
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
12868
am__installdirs = "$(DESTDIR)$(icondir)"
12869
-iconDATA_INSTALL = $(INSTALL_DATA)
12870
DATA = $(icon_DATA)
12871
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
12872
ACLOCAL = @ACLOCAL@
12873
@@ -106,6 +123,7 @@
12874
PACKAGE_NAME = @PACKAGE_NAME@
12875
PACKAGE_STRING = @PACKAGE_STRING@
12876
PACKAGE_TARNAME = @PACKAGE_TARNAME@
12877
+PACKAGE_URL = @PACKAGE_URL@
12878
PACKAGE_VERSION = @PACKAGE_VERSION@
12879
PATH_SEPARATOR = @PATH_SEPARATOR@
12880
PKG_CONFIG = @PKG_CONFIG@
12881
@@ -232,9 +250,9 @@
12885
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/stock/table/Makefile'; \
12886
- cd $(top_srcdir) && \
12887
- $(AUTOMAKE) --gnu 24x24/stock/table/Makefile
12888
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/stock/table/Makefile'; \
12889
+ $(am__cd) $(top_srcdir) && \
12890
+ $(AUTOMAKE) --gnu 24x24/stock/table/Makefile
12891
.PRECIOUS: Makefile
12892
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
12894
@@ -252,23 +270,27 @@
12895
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
12896
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
12897
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
12898
+$(am__aclocal_m4_deps):
12899
install-iconDATA: $(icon_DATA)
12901
test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
12902
- @list='$(icon_DATA)'; for p in $$list; do \
12903
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
12904
+ for p in $$list; do \
12905
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
12906
- f=$(am__strip_dir) \
12907
- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
12908
- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
12910
+ done | $(am__base_list) | \
12911
+ while read files; do \
12912
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
12913
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
12916
uninstall-iconDATA:
12917
@$(NORMAL_UNINSTALL)
12918
- @list='$(icon_DATA)'; for p in $$list; do \
12919
- f=$(am__strip_dir) \
12920
- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
12921
- rm -f "$(DESTDIR)$(icondir)/$$f"; \
12923
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
12924
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
12925
+ test -n "$$files" || exit 0; \
12926
+ echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
12927
+ cd "$(DESTDIR)$(icondir)" && rm -f $$files
12931
@@ -292,13 +314,17 @@
12932
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
12933
if test -d $$d/$$file; then \
12934
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
12935
+ if test -d "$(distdir)/$$file"; then \
12936
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
12938
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
12939
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
12940
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
12941
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
12943
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
12944
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
12946
- test -f $(distdir)/$$file \
12947
- || cp -p $$d/$$file $(distdir)/$$file \
12948
+ test -f "$(distdir)/$$file" \
12949
+ || cp -p $$d/$$file "$(distdir)/$$file" \
12953
@@ -329,6 +355,7 @@
12956
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
12957
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
12959
maintainer-clean-generic:
12960
@echo "This command is intended for maintainers to use"
12961
@@ -347,6 +374,8 @@
12970
@@ -355,18 +384,28 @@
12972
install-dvi: install-dvi-am
12978
install-html: install-html-am
12982
install-info: install-info-am
12988
install-pdf: install-pdf-am
12992
install-ps: install-ps-am
12998
maintainer-clean: maintainer-clean-am
12999
@@ -400,6 +439,7 @@
13000
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
13001
uninstall-am uninstall-iconDATA
13004
# Tell versions [3.59,3.63) of GNU make to not export all variables.
13005
# Otherwise a system limit (for SysV at least) may be exceeded.
13007
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/24x24/stock/text/Makefile.in gnome-icon-theme-2.27.90.new/24x24/stock/text/Makefile.in
13008
--- gnome-icon-theme-2.27.90/24x24/stock/text/Makefile.in 2009-08-13 03:45:46.000000000 +0200
13009
+++ gnome-icon-theme-2.27.90.new/24x24/stock/text/Makefile.in 2009-08-27 12:38:29.000000000 +0200
13011
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
13012
+# Makefile.in generated by automake 1.11 from Makefile.am.
13013
# @configure_input@
13015
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
13016
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
13017
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
13019
# This Makefile.in is free software; the Free Software Foundation
13020
# gives unlimited permission to copy and/or distribute it,
13021
# with or without modifications, as long as this notice is preserved.
13025
pkgdatadir = $(datadir)/@PACKAGE@
13026
-pkglibdir = $(libdir)/@PACKAGE@
13027
pkgincludedir = $(includedir)/@PACKAGE@
13028
+pkglibdir = $(libdir)/@PACKAGE@
13029
+pkglibexecdir = $(libexecdir)/@PACKAGE@
13030
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
13031
install_sh_DATA = $(install_sh) -c -m 644
13032
install_sh_PROGRAM = $(install_sh) -c
13035
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
13036
CONFIG_CLEAN_FILES =
13037
+CONFIG_CLEAN_VPATH_FILES =
13040
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
13042
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
13045
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
13046
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
13047
+am__install_max = 40
13048
+am__nobase_strip_setup = \
13049
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
13050
+am__nobase_strip = \
13051
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
13052
+am__nobase_list = $(am__nobase_strip_setup); \
13053
+ for p in $$list; do echo "$$p $$p"; done | \
13054
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
13055
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
13056
+ if (++n[$$2] == $(am__install_max)) \
13057
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
13058
+ END { for (dir in files) print dir, files[dir] }'
13060
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
13061
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
13062
am__installdirs = "$(DESTDIR)$(icondir)"
13063
-iconDATA_INSTALL = $(INSTALL_DATA)
13064
DATA = $(icon_DATA)
13065
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
13066
ACLOCAL = @ACLOCAL@
13067
@@ -106,6 +123,7 @@
13068
PACKAGE_NAME = @PACKAGE_NAME@
13069
PACKAGE_STRING = @PACKAGE_STRING@
13070
PACKAGE_TARNAME = @PACKAGE_TARNAME@
13071
+PACKAGE_URL = @PACKAGE_URL@
13072
PACKAGE_VERSION = @PACKAGE_VERSION@
13073
PATH_SEPARATOR = @PATH_SEPARATOR@
13074
PKG_CONFIG = @PKG_CONFIG@
13075
@@ -261,9 +279,9 @@
13079
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/stock/text/Makefile'; \
13080
- cd $(top_srcdir) && \
13081
- $(AUTOMAKE) --gnu 24x24/stock/text/Makefile
13082
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 24x24/stock/text/Makefile'; \
13083
+ $(am__cd) $(top_srcdir) && \
13084
+ $(AUTOMAKE) --gnu 24x24/stock/text/Makefile
13085
.PRECIOUS: Makefile
13086
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
13088
@@ -281,23 +299,27 @@
13089
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
13090
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
13091
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
13092
+$(am__aclocal_m4_deps):
13093
install-iconDATA: $(icon_DATA)
13095
test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
13096
- @list='$(icon_DATA)'; for p in $$list; do \
13097
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
13098
+ for p in $$list; do \
13099
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
13100
- f=$(am__strip_dir) \
13101
- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
13102
- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
13104
+ done | $(am__base_list) | \
13105
+ while read files; do \
13106
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
13107
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
13110
uninstall-iconDATA:
13111
@$(NORMAL_UNINSTALL)
13112
- @list='$(icon_DATA)'; for p in $$list; do \
13113
- f=$(am__strip_dir) \
13114
- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
13115
- rm -f "$(DESTDIR)$(icondir)/$$f"; \
13117
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
13118
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
13119
+ test -n "$$files" || exit 0; \
13120
+ echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
13121
+ cd "$(DESTDIR)$(icondir)" && rm -f $$files
13125
@@ -321,13 +343,17 @@
13126
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
13127
if test -d $$d/$$file; then \
13128
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
13129
+ if test -d "$(distdir)/$$file"; then \
13130
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
13132
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
13133
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
13134
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
13135
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
13137
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
13138
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
13140
- test -f $(distdir)/$$file \
13141
- || cp -p $$d/$$file $(distdir)/$$file \
13142
+ test -f "$(distdir)/$$file" \
13143
+ || cp -p $$d/$$file "$(distdir)/$$file" \
13147
@@ -358,6 +384,7 @@
13150
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
13151
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
13153
maintainer-clean-generic:
13154
@echo "This command is intended for maintainers to use"
13155
@@ -376,6 +403,8 @@
13164
@@ -384,18 +413,28 @@
13166
install-dvi: install-dvi-am
13172
install-html: install-html-am
13176
install-info: install-info-am
13182
install-pdf: install-pdf-am
13186
install-ps: install-ps-am
13192
maintainer-clean: maintainer-clean-am
13193
@@ -429,6 +468,7 @@
13194
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
13195
uninstall-am uninstall-iconDATA
13198
# Tell versions [3.59,3.63) of GNU make to not export all variables.
13199
# Otherwise a system limit (for SysV at least) may be exceeded.
13201
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/32x32/actions/Makefile.in gnome-icon-theme-2.27.90.new/32x32/actions/Makefile.in
13202
--- gnome-icon-theme-2.27.90/32x32/actions/Makefile.in 2009-08-13 03:45:46.000000000 +0200
13203
+++ gnome-icon-theme-2.27.90.new/32x32/actions/Makefile.in 2009-08-27 12:38:29.000000000 +0200
13205
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
13206
+# Makefile.in generated by automake 1.11 from Makefile.am.
13207
# @configure_input@
13209
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
13210
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
13211
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
13213
# This Makefile.in is free software; the Free Software Foundation
13214
# gives unlimited permission to copy and/or distribute it,
13215
# with or without modifications, as long as this notice is preserved.
13219
pkgdatadir = $(datadir)/@PACKAGE@
13220
-pkglibdir = $(libdir)/@PACKAGE@
13221
pkgincludedir = $(includedir)/@PACKAGE@
13222
+pkglibdir = $(libdir)/@PACKAGE@
13223
+pkglibexecdir = $(libexecdir)/@PACKAGE@
13224
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
13225
install_sh_DATA = $(install_sh) -c -m 644
13226
install_sh_PROGRAM = $(install_sh) -c
13229
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
13230
CONFIG_CLEAN_FILES =
13231
+CONFIG_CLEAN_VPATH_FILES =
13234
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
13236
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
13239
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
13240
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
13241
+am__install_max = 40
13242
+am__nobase_strip_setup = \
13243
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
13244
+am__nobase_strip = \
13245
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
13246
+am__nobase_list = $(am__nobase_strip_setup); \
13247
+ for p in $$list; do echo "$$p $$p"; done | \
13248
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
13249
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
13250
+ if (++n[$$2] == $(am__install_max)) \
13251
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
13252
+ END { for (dir in files) print dir, files[dir] }'
13254
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
13255
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
13256
am__installdirs = "$(DESTDIR)$(iconsdir)"
13257
-iconsDATA_INSTALL = $(INSTALL_DATA)
13258
DATA = $(icons_DATA)
13259
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
13260
ACLOCAL = @ACLOCAL@
13261
@@ -106,6 +123,7 @@
13262
PACKAGE_NAME = @PACKAGE_NAME@
13263
PACKAGE_STRING = @PACKAGE_STRING@
13264
PACKAGE_TARNAME = @PACKAGE_TARNAME@
13265
+PACKAGE_URL = @PACKAGE_URL@
13266
PACKAGE_VERSION = @PACKAGE_VERSION@
13267
PATH_SEPARATOR = @PATH_SEPARATOR@
13268
PKG_CONFIG = @PKG_CONFIG@
13269
@@ -284,9 +302,9 @@
13273
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 32x32/actions/Makefile'; \
13274
- cd $(top_srcdir) && \
13275
- $(AUTOMAKE) --gnu 32x32/actions/Makefile
13276
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 32x32/actions/Makefile'; \
13277
+ $(am__cd) $(top_srcdir) && \
13278
+ $(AUTOMAKE) --gnu 32x32/actions/Makefile
13279
.PRECIOUS: Makefile
13280
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
13282
@@ -304,23 +322,27 @@
13283
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
13284
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
13285
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
13286
+$(am__aclocal_m4_deps):
13287
install-iconsDATA: $(icons_DATA)
13289
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
13290
- @list='$(icons_DATA)'; for p in $$list; do \
13291
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
13292
+ for p in $$list; do \
13293
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
13294
- f=$(am__strip_dir) \
13295
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
13296
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
13298
+ done | $(am__base_list) | \
13299
+ while read files; do \
13300
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
13301
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
13304
uninstall-iconsDATA:
13305
@$(NORMAL_UNINSTALL)
13306
- @list='$(icons_DATA)'; for p in $$list; do \
13307
- f=$(am__strip_dir) \
13308
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
13309
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
13311
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
13312
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
13313
+ test -n "$$files" || exit 0; \
13314
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
13315
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
13319
@@ -344,13 +366,17 @@
13320
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
13321
if test -d $$d/$$file; then \
13322
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
13323
+ if test -d "$(distdir)/$$file"; then \
13324
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
13326
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
13327
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
13328
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
13329
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
13331
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
13332
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
13334
- test -f $(distdir)/$$file \
13335
- || cp -p $$d/$$file $(distdir)/$$file \
13336
+ test -f "$(distdir)/$$file" \
13337
+ || cp -p $$d/$$file "$(distdir)/$$file" \
13341
@@ -381,6 +407,7 @@
13344
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
13345
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
13347
maintainer-clean-generic:
13348
@echo "This command is intended for maintainers to use"
13349
@@ -400,6 +427,8 @@
13358
@@ -408,18 +437,28 @@
13360
install-dvi: install-dvi-am
13366
install-html: install-html-am
13370
install-info: install-info-am
13376
install-pdf: install-pdf-am
13380
install-ps: install-ps-am
13386
maintainer-clean: maintainer-clean-am
13387
@@ -475,6 +514,7 @@
13392
# Tell versions [3.59,3.63) of GNU make to not export all variables.
13393
# Otherwise a system limit (for SysV at least) may be exceeded.
13395
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/32x32/animations/Makefile.in gnome-icon-theme-2.27.90.new/32x32/animations/Makefile.in
13396
--- gnome-icon-theme-2.27.90/32x32/animations/Makefile.in 2009-08-13 03:45:46.000000000 +0200
13397
+++ gnome-icon-theme-2.27.90.new/32x32/animations/Makefile.in 2009-08-27 12:38:29.000000000 +0200
13399
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
13400
+# Makefile.in generated by automake 1.11 from Makefile.am.
13401
# @configure_input@
13403
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
13404
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
13405
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
13407
# This Makefile.in is free software; the Free Software Foundation
13408
# gives unlimited permission to copy and/or distribute it,
13409
# with or without modifications, as long as this notice is preserved.
13413
pkgdatadir = $(datadir)/@PACKAGE@
13414
-pkglibdir = $(libdir)/@PACKAGE@
13415
pkgincludedir = $(includedir)/@PACKAGE@
13416
+pkglibdir = $(libdir)/@PACKAGE@
13417
+pkglibexecdir = $(libexecdir)/@PACKAGE@
13418
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
13419
install_sh_DATA = $(install_sh) -c -m 644
13420
install_sh_PROGRAM = $(install_sh) -c
13423
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
13424
CONFIG_CLEAN_FILES =
13425
+CONFIG_CLEAN_VPATH_FILES =
13428
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
13430
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
13433
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
13434
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
13435
+am__install_max = 40
13436
+am__nobase_strip_setup = \
13437
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
13438
+am__nobase_strip = \
13439
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
13440
+am__nobase_list = $(am__nobase_strip_setup); \
13441
+ for p in $$list; do echo "$$p $$p"; done | \
13442
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
13443
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
13444
+ if (++n[$$2] == $(am__install_max)) \
13445
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
13446
+ END { for (dir in files) print dir, files[dir] }'
13448
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
13449
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
13450
am__installdirs = "$(DESTDIR)$(iconsdir)"
13451
-iconsDATA_INSTALL = $(INSTALL_DATA)
13452
DATA = $(icons_DATA)
13453
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
13454
ACLOCAL = @ACLOCAL@
13455
@@ -106,6 +123,7 @@
13456
PACKAGE_NAME = @PACKAGE_NAME@
13457
PACKAGE_STRING = @PACKAGE_STRING@
13458
PACKAGE_TARNAME = @PACKAGE_TARNAME@
13459
+PACKAGE_URL = @PACKAGE_URL@
13460
PACKAGE_VERSION = @PACKAGE_VERSION@
13461
PATH_SEPARATOR = @PATH_SEPARATOR@
13462
PKG_CONFIG = @PKG_CONFIG@
13463
@@ -186,9 +204,9 @@
13467
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 32x32/animations/Makefile'; \
13468
- cd $(top_srcdir) && \
13469
- $(AUTOMAKE) --gnu 32x32/animations/Makefile
13470
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 32x32/animations/Makefile'; \
13471
+ $(am__cd) $(top_srcdir) && \
13472
+ $(AUTOMAKE) --gnu 32x32/animations/Makefile
13473
.PRECIOUS: Makefile
13474
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
13476
@@ -206,23 +224,27 @@
13477
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
13478
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
13479
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
13480
+$(am__aclocal_m4_deps):
13481
install-iconsDATA: $(icons_DATA)
13483
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
13484
- @list='$(icons_DATA)'; for p in $$list; do \
13485
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
13486
+ for p in $$list; do \
13487
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
13488
- f=$(am__strip_dir) \
13489
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
13490
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
13492
+ done | $(am__base_list) | \
13493
+ while read files; do \
13494
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
13495
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
13498
uninstall-iconsDATA:
13499
@$(NORMAL_UNINSTALL)
13500
- @list='$(icons_DATA)'; for p in $$list; do \
13501
- f=$(am__strip_dir) \
13502
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
13503
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
13505
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
13506
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
13507
+ test -n "$$files" || exit 0; \
13508
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
13509
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
13513
@@ -246,13 +268,17 @@
13514
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
13515
if test -d $$d/$$file; then \
13516
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
13517
+ if test -d "$(distdir)/$$file"; then \
13518
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
13520
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
13521
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
13522
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
13523
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
13525
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
13526
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
13528
- test -f $(distdir)/$$file \
13529
- || cp -p $$d/$$file $(distdir)/$$file \
13530
+ test -f "$(distdir)/$$file" \
13531
+ || cp -p $$d/$$file "$(distdir)/$$file" \
13535
@@ -283,6 +309,7 @@
13538
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
13539
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
13541
maintainer-clean-generic:
13542
@echo "This command is intended for maintainers to use"
13543
@@ -302,6 +329,8 @@
13552
@@ -310,18 +339,28 @@
13554
install-dvi: install-dvi-am
13560
install-html: install-html-am
13564
install-info: install-info-am
13570
install-pdf: install-pdf-am
13574
install-ps: install-ps-am
13580
maintainer-clean: maintainer-clean-am
13581
@@ -377,6 +416,7 @@
13586
# Tell versions [3.59,3.63) of GNU make to not export all variables.
13587
# Otherwise a system limit (for SysV at least) may be exceeded.
13589
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/32x32/apps/Makefile.in gnome-icon-theme-2.27.90.new/32x32/apps/Makefile.in
13590
--- gnome-icon-theme-2.27.90/32x32/apps/Makefile.in 2009-08-13 03:45:47.000000000 +0200
13591
+++ gnome-icon-theme-2.27.90.new/32x32/apps/Makefile.in 2009-08-27 12:38:29.000000000 +0200
13593
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
13594
+# Makefile.in generated by automake 1.11 from Makefile.am.
13595
# @configure_input@
13597
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
13598
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
13599
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
13601
# This Makefile.in is free software; the Free Software Foundation
13602
# gives unlimited permission to copy and/or distribute it,
13603
# with or without modifications, as long as this notice is preserved.
13607
pkgdatadir = $(datadir)/@PACKAGE@
13608
-pkglibdir = $(libdir)/@PACKAGE@
13609
pkgincludedir = $(includedir)/@PACKAGE@
13610
+pkglibdir = $(libdir)/@PACKAGE@
13611
+pkglibexecdir = $(libexecdir)/@PACKAGE@
13612
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
13613
install_sh_DATA = $(install_sh) -c -m 644
13614
install_sh_PROGRAM = $(install_sh) -c
13617
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
13618
CONFIG_CLEAN_FILES =
13619
+CONFIG_CLEAN_VPATH_FILES =
13622
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
13624
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
13627
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
13628
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
13629
+am__install_max = 40
13630
+am__nobase_strip_setup = \
13631
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
13632
+am__nobase_strip = \
13633
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
13634
+am__nobase_list = $(am__nobase_strip_setup); \
13635
+ for p in $$list; do echo "$$p $$p"; done | \
13636
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
13637
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
13638
+ if (++n[$$2] == $(am__install_max)) \
13639
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
13640
+ END { for (dir in files) print dir, files[dir] }'
13642
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
13643
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
13644
am__installdirs = "$(DESTDIR)$(iconsdir)"
13645
-iconsDATA_INSTALL = $(INSTALL_DATA)
13646
DATA = $(icons_DATA)
13647
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
13648
ACLOCAL = @ACLOCAL@
13649
@@ -106,6 +123,7 @@
13650
PACKAGE_NAME = @PACKAGE_NAME@
13651
PACKAGE_STRING = @PACKAGE_STRING@
13652
PACKAGE_TARNAME = @PACKAGE_TARNAME@
13653
+PACKAGE_URL = @PACKAGE_URL@
13654
PACKAGE_VERSION = @PACKAGE_VERSION@
13655
PATH_SEPARATOR = @PATH_SEPARATOR@
13656
PKG_CONFIG = @PKG_CONFIG@
13657
@@ -209,9 +227,9 @@
13661
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 32x32/apps/Makefile'; \
13662
- cd $(top_srcdir) && \
13663
- $(AUTOMAKE) --gnu 32x32/apps/Makefile
13664
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 32x32/apps/Makefile'; \
13665
+ $(am__cd) $(top_srcdir) && \
13666
+ $(AUTOMAKE) --gnu 32x32/apps/Makefile
13667
.PRECIOUS: Makefile
13668
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
13670
@@ -229,23 +247,27 @@
13671
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
13672
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
13673
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
13674
+$(am__aclocal_m4_deps):
13675
install-iconsDATA: $(icons_DATA)
13677
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
13678
- @list='$(icons_DATA)'; for p in $$list; do \
13679
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
13680
+ for p in $$list; do \
13681
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
13682
- f=$(am__strip_dir) \
13683
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
13684
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
13686
+ done | $(am__base_list) | \
13687
+ while read files; do \
13688
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
13689
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
13692
uninstall-iconsDATA:
13693
@$(NORMAL_UNINSTALL)
13694
- @list='$(icons_DATA)'; for p in $$list; do \
13695
- f=$(am__strip_dir) \
13696
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
13697
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
13699
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
13700
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
13701
+ test -n "$$files" || exit 0; \
13702
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
13703
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
13707
@@ -269,13 +291,17 @@
13708
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
13709
if test -d $$d/$$file; then \
13710
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
13711
+ if test -d "$(distdir)/$$file"; then \
13712
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
13714
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
13715
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
13716
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
13717
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
13719
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
13720
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
13722
- test -f $(distdir)/$$file \
13723
- || cp -p $$d/$$file $(distdir)/$$file \
13724
+ test -f "$(distdir)/$$file" \
13725
+ || cp -p $$d/$$file "$(distdir)/$$file" \
13729
@@ -306,6 +332,7 @@
13732
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
13733
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
13735
maintainer-clean-generic:
13736
@echo "This command is intended for maintainers to use"
13737
@@ -325,6 +352,8 @@
13746
@@ -333,18 +362,28 @@
13748
install-dvi: install-dvi-am
13754
install-html: install-html-am
13758
install-info: install-info-am
13764
install-pdf: install-pdf-am
13768
install-ps: install-ps-am
13774
maintainer-clean: maintainer-clean-am
13775
@@ -400,6 +439,7 @@
13780
# Tell versions [3.59,3.63) of GNU make to not export all variables.
13781
# Otherwise a system limit (for SysV at least) may be exceeded.
13783
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/32x32/categories/Makefile.in gnome-icon-theme-2.27.90.new/32x32/categories/Makefile.in
13784
--- gnome-icon-theme-2.27.90/32x32/categories/Makefile.in 2009-08-13 03:45:47.000000000 +0200
13785
+++ gnome-icon-theme-2.27.90.new/32x32/categories/Makefile.in 2009-08-27 12:38:29.000000000 +0200
13787
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
13788
+# Makefile.in generated by automake 1.11 from Makefile.am.
13789
# @configure_input@
13791
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
13792
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
13793
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
13795
# This Makefile.in is free software; the Free Software Foundation
13796
# gives unlimited permission to copy and/or distribute it,
13797
# with or without modifications, as long as this notice is preserved.
13801
pkgdatadir = $(datadir)/@PACKAGE@
13802
-pkglibdir = $(libdir)/@PACKAGE@
13803
pkgincludedir = $(includedir)/@PACKAGE@
13804
+pkglibdir = $(libdir)/@PACKAGE@
13805
+pkglibexecdir = $(libexecdir)/@PACKAGE@
13806
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
13807
install_sh_DATA = $(install_sh) -c -m 644
13808
install_sh_PROGRAM = $(install_sh) -c
13811
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
13812
CONFIG_CLEAN_FILES =
13813
+CONFIG_CLEAN_VPATH_FILES =
13816
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
13818
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
13821
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
13822
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
13823
+am__install_max = 40
13824
+am__nobase_strip_setup = \
13825
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
13826
+am__nobase_strip = \
13827
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
13828
+am__nobase_list = $(am__nobase_strip_setup); \
13829
+ for p in $$list; do echo "$$p $$p"; done | \
13830
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
13831
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
13832
+ if (++n[$$2] == $(am__install_max)) \
13833
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
13834
+ END { for (dir in files) print dir, files[dir] }'
13836
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
13837
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
13838
am__installdirs = "$(DESTDIR)$(iconsdir)"
13839
-iconsDATA_INSTALL = $(INSTALL_DATA)
13840
DATA = $(icons_DATA)
13841
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
13842
ACLOCAL = @ACLOCAL@
13843
@@ -106,6 +123,7 @@
13844
PACKAGE_NAME = @PACKAGE_NAME@
13845
PACKAGE_STRING = @PACKAGE_STRING@
13846
PACKAGE_TARNAME = @PACKAGE_TARNAME@
13847
+PACKAGE_URL = @PACKAGE_URL@
13848
PACKAGE_VERSION = @PACKAGE_VERSION@
13849
PATH_SEPARATOR = @PATH_SEPARATOR@
13850
PKG_CONFIG = @PKG_CONFIG@
13851
@@ -204,9 +222,9 @@
13855
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 32x32/categories/Makefile'; \
13856
- cd $(top_srcdir) && \
13857
- $(AUTOMAKE) --gnu 32x32/categories/Makefile
13858
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 32x32/categories/Makefile'; \
13859
+ $(am__cd) $(top_srcdir) && \
13860
+ $(AUTOMAKE) --gnu 32x32/categories/Makefile
13861
.PRECIOUS: Makefile
13862
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
13864
@@ -224,23 +242,27 @@
13865
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
13866
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
13867
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
13868
+$(am__aclocal_m4_deps):
13869
install-iconsDATA: $(icons_DATA)
13871
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
13872
- @list='$(icons_DATA)'; for p in $$list; do \
13873
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
13874
+ for p in $$list; do \
13875
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
13876
- f=$(am__strip_dir) \
13877
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
13878
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
13880
+ done | $(am__base_list) | \
13881
+ while read files; do \
13882
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
13883
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
13886
uninstall-iconsDATA:
13887
@$(NORMAL_UNINSTALL)
13888
- @list='$(icons_DATA)'; for p in $$list; do \
13889
- f=$(am__strip_dir) \
13890
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
13891
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
13893
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
13894
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
13895
+ test -n "$$files" || exit 0; \
13896
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
13897
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
13901
@@ -264,13 +286,17 @@
13902
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
13903
if test -d $$d/$$file; then \
13904
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
13905
+ if test -d "$(distdir)/$$file"; then \
13906
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
13908
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
13909
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
13910
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
13911
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
13913
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
13914
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
13916
- test -f $(distdir)/$$file \
13917
- || cp -p $$d/$$file $(distdir)/$$file \
13918
+ test -f "$(distdir)/$$file" \
13919
+ || cp -p $$d/$$file "$(distdir)/$$file" \
13923
@@ -301,6 +327,7 @@
13926
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
13927
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
13929
maintainer-clean-generic:
13930
@echo "This command is intended for maintainers to use"
13931
@@ -320,6 +347,8 @@
13940
@@ -328,18 +357,28 @@
13942
install-dvi: install-dvi-am
13948
install-html: install-html-am
13952
install-info: install-info-am
13958
install-pdf: install-pdf-am
13962
install-ps: install-ps-am
13968
maintainer-clean: maintainer-clean-am
13969
@@ -395,6 +434,7 @@
13974
# Tell versions [3.59,3.63) of GNU make to not export all variables.
13975
# Otherwise a system limit (for SysV at least) may be exceeded.
13977
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/32x32/devices/Makefile.in gnome-icon-theme-2.27.90.new/32x32/devices/Makefile.in
13978
--- gnome-icon-theme-2.27.90/32x32/devices/Makefile.in 2009-08-13 03:45:47.000000000 +0200
13979
+++ gnome-icon-theme-2.27.90.new/32x32/devices/Makefile.in 2009-08-27 12:38:30.000000000 +0200
13981
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
13982
+# Makefile.in generated by automake 1.11 from Makefile.am.
13983
# @configure_input@
13985
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
13986
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
13987
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
13989
# This Makefile.in is free software; the Free Software Foundation
13990
# gives unlimited permission to copy and/or distribute it,
13991
# with or without modifications, as long as this notice is preserved.
13995
pkgdatadir = $(datadir)/@PACKAGE@
13996
-pkglibdir = $(libdir)/@PACKAGE@
13997
pkgincludedir = $(includedir)/@PACKAGE@
13998
+pkglibdir = $(libdir)/@PACKAGE@
13999
+pkglibexecdir = $(libexecdir)/@PACKAGE@
14000
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
14001
install_sh_DATA = $(install_sh) -c -m 644
14002
install_sh_PROGRAM = $(install_sh) -c
14005
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
14006
CONFIG_CLEAN_FILES =
14007
+CONFIG_CLEAN_VPATH_FILES =
14010
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
14012
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
14015
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
14016
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
14017
+am__install_max = 40
14018
+am__nobase_strip_setup = \
14019
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
14020
+am__nobase_strip = \
14021
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
14022
+am__nobase_list = $(am__nobase_strip_setup); \
14023
+ for p in $$list; do echo "$$p $$p"; done | \
14024
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
14025
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
14026
+ if (++n[$$2] == $(am__install_max)) \
14027
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
14028
+ END { for (dir in files) print dir, files[dir] }'
14030
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
14031
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
14032
am__installdirs = "$(DESTDIR)$(iconsdir)"
14033
-iconsDATA_INSTALL = $(INSTALL_DATA)
14034
DATA = $(icons_DATA)
14035
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
14036
ACLOCAL = @ACLOCAL@
14037
@@ -106,6 +123,7 @@
14038
PACKAGE_NAME = @PACKAGE_NAME@
14039
PACKAGE_STRING = @PACKAGE_STRING@
14040
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14041
+PACKAGE_URL = @PACKAGE_URL@
14042
PACKAGE_VERSION = @PACKAGE_VERSION@
14043
PATH_SEPARATOR = @PATH_SEPARATOR@
14044
PKG_CONFIG = @PKG_CONFIG@
14045
@@ -211,9 +229,9 @@
14049
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 32x32/devices/Makefile'; \
14050
- cd $(top_srcdir) && \
14051
- $(AUTOMAKE) --gnu 32x32/devices/Makefile
14052
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 32x32/devices/Makefile'; \
14053
+ $(am__cd) $(top_srcdir) && \
14054
+ $(AUTOMAKE) --gnu 32x32/devices/Makefile
14055
.PRECIOUS: Makefile
14056
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
14058
@@ -231,23 +249,27 @@
14059
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
14060
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
14061
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
14062
+$(am__aclocal_m4_deps):
14063
install-iconsDATA: $(icons_DATA)
14065
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
14066
- @list='$(icons_DATA)'; for p in $$list; do \
14067
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
14068
+ for p in $$list; do \
14069
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
14070
- f=$(am__strip_dir) \
14071
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
14072
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
14074
+ done | $(am__base_list) | \
14075
+ while read files; do \
14076
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
14077
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
14080
uninstall-iconsDATA:
14081
@$(NORMAL_UNINSTALL)
14082
- @list='$(icons_DATA)'; for p in $$list; do \
14083
- f=$(am__strip_dir) \
14084
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
14085
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
14087
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
14088
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
14089
+ test -n "$$files" || exit 0; \
14090
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
14091
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
14095
@@ -271,13 +293,17 @@
14096
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
14097
if test -d $$d/$$file; then \
14098
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
14099
+ if test -d "$(distdir)/$$file"; then \
14100
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
14102
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
14103
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
14104
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
14105
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
14107
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
14108
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
14110
- test -f $(distdir)/$$file \
14111
- || cp -p $$d/$$file $(distdir)/$$file \
14112
+ test -f "$(distdir)/$$file" \
14113
+ || cp -p $$d/$$file "$(distdir)/$$file" \
14117
@@ -308,6 +334,7 @@
14120
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
14121
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
14123
maintainer-clean-generic:
14124
@echo "This command is intended for maintainers to use"
14125
@@ -327,6 +354,8 @@
14134
@@ -335,18 +364,28 @@
14136
install-dvi: install-dvi-am
14142
install-html: install-html-am
14146
install-info: install-info-am
14152
install-pdf: install-pdf-am
14156
install-ps: install-ps-am
14162
maintainer-clean: maintainer-clean-am
14163
@@ -402,6 +441,7 @@
14168
# Tell versions [3.59,3.63) of GNU make to not export all variables.
14169
# Otherwise a system limit (for SysV at least) may be exceeded.
14171
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/32x32/emblems/Makefile.in gnome-icon-theme-2.27.90.new/32x32/emblems/Makefile.in
14172
--- gnome-icon-theme-2.27.90/32x32/emblems/Makefile.in 2009-08-13 03:45:47.000000000 +0200
14173
+++ gnome-icon-theme-2.27.90.new/32x32/emblems/Makefile.in 2009-08-27 12:38:30.000000000 +0200
14175
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
14176
+# Makefile.in generated by automake 1.11 from Makefile.am.
14177
# @configure_input@
14179
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
14180
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
14181
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
14183
# This Makefile.in is free software; the Free Software Foundation
14184
# gives unlimited permission to copy and/or distribute it,
14185
# with or without modifications, as long as this notice is preserved.
14189
pkgdatadir = $(datadir)/@PACKAGE@
14190
-pkglibdir = $(libdir)/@PACKAGE@
14191
pkgincludedir = $(includedir)/@PACKAGE@
14192
+pkglibdir = $(libdir)/@PACKAGE@
14193
+pkglibexecdir = $(libexecdir)/@PACKAGE@
14194
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
14195
install_sh_DATA = $(install_sh) -c -m 644
14196
install_sh_PROGRAM = $(install_sh) -c
14199
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
14200
CONFIG_CLEAN_FILES =
14201
+CONFIG_CLEAN_VPATH_FILES =
14204
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
14205
@@ -45,10 +48,24 @@
14206
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
14209
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
1
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.28.0/32x32/emblems/Makefile.in gnome-icon-theme-2.28.0.new/32x32/emblems/Makefile.in
2
--- gnome-icon-theme-2.28.0/32x32/emblems/Makefile.in 2009-09-22 11:40:58.000000000 +1000
3
+++ gnome-icon-theme-2.28.0.new/32x32/emblems/Makefile.in 2009-09-22 14:06:11.000000000 +1000
6
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
7
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
14210
8
-am__installdirs = "$(DESTDIR)$(iconsdir)"
14211
-iconsDATA_INSTALL = $(INSTALL_DATA)
14212
9
-DATA = $(icons_DATA)
14213
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
14214
+am__install_max = 40
14215
+am__nobase_strip_setup = \
14216
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
14217
+am__nobase_strip = \
14218
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
14219
+am__nobase_list = $(am__nobase_strip_setup); \
14220
+ for p in $$list; do echo "$$p $$p"; done | \
14221
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
14222
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
14223
+ if (++n[$$2] == $(am__install_max)) \
14224
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
14225
+ END { for (dir in files) print dir, files[dir] }'
14227
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
14228
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
14229
10
+am__installdirs = "$(DESTDIR)$(iconsdir)" "$(DESTDIR)$(icons_indir)"
14230
11
+DATA = $(icons_DATA) $(icons_in_DATA)
14231
12
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
14232
13
ACLOCAL = @ACLOCAL@
14233
14
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
14234
@@ -106,6 +123,7 @@
14235
PACKAGE_NAME = @PACKAGE_NAME@
14236
PACKAGE_STRING = @PACKAGE_STRING@
14237
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14238
+PACKAGE_URL = @PACKAGE_URL@
14239
PACKAGE_VERSION = @PACKAGE_VERSION@
14240
PATH_SEPARATOR = @PATH_SEPARATOR@
14241
PKG_CONFIG = @PKG_CONFIG@
14242
@@ -166,6 +184,7 @@
14244
17
context = emblems
14245
18
iconsdir = $(themedir)/$(size)/$(context)
14461
135
+ maintainer-clean maintainer-clean-generic mostlyclean \
14462
136
+ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
14463
137
+ uninstall-iconsDATA uninstall-icons_inDATA
140
+%.icon: %.icon.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
14466
142
-install-data-local: install-iconsDATA
14467
+%.icon: %.icon.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
14469
143
+install-data-local: install-icons_inDATA install-iconsDATA
14470
144
(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
14473
@@ -393,6 +483,7 @@
14478
# Tell versions [3.59,3.63) of GNU make to not export all variables.
14479
# Otherwise a system limit (for SysV at least) may be exceeded.
14481
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/32x32/emotes/Makefile.in gnome-icon-theme-2.27.90.new/32x32/emotes/Makefile.in
14482
--- gnome-icon-theme-2.27.90/32x32/emotes/Makefile.in 2009-08-13 03:45:47.000000000 +0200
14483
+++ gnome-icon-theme-2.27.90.new/32x32/emotes/Makefile.in 2009-08-27 12:38:30.000000000 +0200
14485
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
14486
+# Makefile.in generated by automake 1.11 from Makefile.am.
14487
# @configure_input@
14489
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
14490
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
14491
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
14493
# This Makefile.in is free software; the Free Software Foundation
14494
# gives unlimited permission to copy and/or distribute it,
14495
# with or without modifications, as long as this notice is preserved.
14499
pkgdatadir = $(datadir)/@PACKAGE@
14500
-pkglibdir = $(libdir)/@PACKAGE@
14501
pkgincludedir = $(includedir)/@PACKAGE@
14502
+pkglibdir = $(libdir)/@PACKAGE@
14503
+pkglibexecdir = $(libexecdir)/@PACKAGE@
14504
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
14505
install_sh_DATA = $(install_sh) -c -m 644
14506
install_sh_PROGRAM = $(install_sh) -c
14509
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
14510
CONFIG_CLEAN_FILES =
14511
+CONFIG_CLEAN_VPATH_FILES =
14514
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
14516
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
14519
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
14520
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
14521
+am__install_max = 40
14522
+am__nobase_strip_setup = \
14523
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
14524
+am__nobase_strip = \
14525
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
14526
+am__nobase_list = $(am__nobase_strip_setup); \
14527
+ for p in $$list; do echo "$$p $$p"; done | \
14528
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
14529
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
14530
+ if (++n[$$2] == $(am__install_max)) \
14531
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
14532
+ END { for (dir in files) print dir, files[dir] }'
14534
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
14535
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
14536
am__installdirs = "$(DESTDIR)$(iconsdir)"
14537
-iconsDATA_INSTALL = $(INSTALL_DATA)
14538
DATA = $(icons_DATA)
14539
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
14540
ACLOCAL = @ACLOCAL@
14541
@@ -106,6 +123,7 @@
14542
PACKAGE_NAME = @PACKAGE_NAME@
14543
PACKAGE_STRING = @PACKAGE_STRING@
14544
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14545
+PACKAGE_URL = @PACKAGE_URL@
14546
PACKAGE_VERSION = @PACKAGE_VERSION@
14547
PATH_SEPARATOR = @PATH_SEPARATOR@
14548
PKG_CONFIG = @PKG_CONFIG@
14549
@@ -206,9 +224,9 @@
14553
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 32x32/emotes/Makefile'; \
14554
- cd $(top_srcdir) && \
14555
- $(AUTOMAKE) --gnu 32x32/emotes/Makefile
14556
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 32x32/emotes/Makefile'; \
14557
+ $(am__cd) $(top_srcdir) && \
14558
+ $(AUTOMAKE) --gnu 32x32/emotes/Makefile
14559
.PRECIOUS: Makefile
14560
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
14562
@@ -226,23 +244,27 @@
14563
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
14564
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
14565
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
14566
+$(am__aclocal_m4_deps):
14567
install-iconsDATA: $(icons_DATA)
14569
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
14570
- @list='$(icons_DATA)'; for p in $$list; do \
14571
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
14572
+ for p in $$list; do \
14573
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
14574
- f=$(am__strip_dir) \
14575
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
14576
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
14578
+ done | $(am__base_list) | \
14579
+ while read files; do \
14580
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
14581
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
14584
uninstall-iconsDATA:
14585
@$(NORMAL_UNINSTALL)
14586
- @list='$(icons_DATA)'; for p in $$list; do \
14587
- f=$(am__strip_dir) \
14588
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
14589
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
14591
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
14592
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
14593
+ test -n "$$files" || exit 0; \
14594
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
14595
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
14599
@@ -266,13 +288,17 @@
14600
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
14601
if test -d $$d/$$file; then \
14602
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
14603
+ if test -d "$(distdir)/$$file"; then \
14604
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
14606
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
14607
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
14608
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
14609
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
14611
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
14612
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
14614
- test -f $(distdir)/$$file \
14615
- || cp -p $$d/$$file $(distdir)/$$file \
14616
+ test -f "$(distdir)/$$file" \
14617
+ || cp -p $$d/$$file "$(distdir)/$$file" \
14621
@@ -303,6 +329,7 @@
14624
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
14625
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
14627
maintainer-clean-generic:
14628
@echo "This command is intended for maintainers to use"
14629
@@ -322,6 +349,8 @@
14638
@@ -330,18 +359,28 @@
14640
install-dvi: install-dvi-am
14646
install-html: install-html-am
14650
install-info: install-info-am
14656
install-pdf: install-pdf-am
14660
install-ps: install-ps-am
14666
maintainer-clean: maintainer-clean-am
14667
@@ -397,6 +436,7 @@
14672
# Tell versions [3.59,3.63) of GNU make to not export all variables.
14673
# Otherwise a system limit (for SysV at least) may be exceeded.
14675
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/32x32/Makefile.in gnome-icon-theme-2.27.90.new/32x32/Makefile.in
14676
--- gnome-icon-theme-2.27.90/32x32/Makefile.in 2009-08-13 03:45:46.000000000 +0200
14677
+++ gnome-icon-theme-2.27.90.new/32x32/Makefile.in 2009-08-27 12:38:29.000000000 +0200
14679
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
14680
+# Makefile.in generated by automake 1.11 from Makefile.am.
14681
# @configure_input@
14683
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
14684
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
14685
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
14687
# This Makefile.in is free software; the Free Software Foundation
14688
# gives unlimited permission to copy and/or distribute it,
14689
# with or without modifications, as long as this notice is preserved.
14693
pkgdatadir = $(datadir)/@PACKAGE@
14694
-pkglibdir = $(libdir)/@PACKAGE@
14695
pkgincludedir = $(includedir)/@PACKAGE@
14696
+pkglibdir = $(libdir)/@PACKAGE@
14697
+pkglibexecdir = $(libexecdir)/@PACKAGE@
14698
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
14699
install_sh_DATA = $(install_sh) -c -m 644
14700
install_sh_PROGRAM = $(install_sh) -c
14703
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
14704
CONFIG_CLEAN_FILES =
14705
+CONFIG_CLEAN_VPATH_FILES =
14708
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
14709
@@ -48,10 +51,38 @@
14710
ps-recursive uninstall-recursive
14711
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
14712
distclean-recursive maintainer-clean-recursive
14713
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
14714
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
14718
DIST_SUBDIRS = $(SUBDIRS)
14719
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
14720
+am__relativize = \
14722
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
14723
+ sed_rest='s,^[^/]*/*,,'; \
14724
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
14725
+ sed_butlast='s,/*[^/]*$$,,'; \
14726
+ while test -n "$$dir1"; do \
14727
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
14728
+ if test "$$first" != "."; then \
14729
+ if test "$$first" = ".."; then \
14730
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
14731
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
14733
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
14734
+ if test "$$first2" = "$$first"; then \
14735
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
14737
+ dir2="../$$dir2"; \
14739
+ dir0="$$dir0"/"$$first"; \
14742
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
14745
ACLOCAL = @ACLOCAL@
14746
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
14747
ALL_LINGUAS = @ALL_LINGUAS@
14748
@@ -108,6 +139,7 @@
14749
PACKAGE_NAME = @PACKAGE_NAME@
14750
PACKAGE_STRING = @PACKAGE_STRING@
14751
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14752
+PACKAGE_URL = @PACKAGE_URL@
14753
PACKAGE_VERSION = @PACKAGE_VERSION@
14754
PATH_SEPARATOR = @PATH_SEPARATOR@
14755
PKG_CONFIG = @PKG_CONFIG@
14756
@@ -192,9 +224,9 @@
14760
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 32x32/Makefile'; \
14761
- cd $(top_srcdir) && \
14762
- $(AUTOMAKE) --gnu 32x32/Makefile
14763
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 32x32/Makefile'; \
14764
+ $(am__cd) $(top_srcdir) && \
14765
+ $(AUTOMAKE) --gnu 32x32/Makefile
14766
.PRECIOUS: Makefile
14767
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
14769
@@ -212,6 +244,7 @@
14770
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
14771
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
14772
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
14773
+$(am__aclocal_m4_deps):
14775
# This directory's subdirectories are mostly independent; you can cd
14776
# into them and run `make' without going through this Makefile.
14777
@@ -237,7 +270,7 @@
14779
local_target="$$target"; \
14781
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
14782
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
14783
|| eval $$failcom; \
14785
if test "$$dot_seen" = "no"; then \
14786
@@ -271,16 +304,16 @@
14788
local_target="$$target"; \
14790
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
14791
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
14792
|| eval $$failcom; \
14793
done && test -z "$$fail"
14795
list='$(SUBDIRS)'; for subdir in $$list; do \
14796
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
14797
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
14800
list='$(SUBDIRS)'; for subdir in $$list; do \
14801
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
14802
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
14805
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
14806
@@ -295,7 +328,7 @@
14808
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
14809
$(TAGS_FILES) $(LISP)
14813
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
14814
include_option=--etags-include; \
14815
@@ -307,7 +340,7 @@
14816
list='$(SUBDIRS)'; for subdir in $$list; do \
14817
if test "$$subdir" = .; then :; else \
14818
test ! -f $$subdir/TAGS || \
14819
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
14820
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
14823
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
14824
@@ -316,29 +349,34 @@
14826
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
14827
END { if (nonempty) { for (i in files) print i; }; }'`; \
14828
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
14830
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
14831
test -n "$$unique" || unique=$$empty_fix; \
14832
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
14833
- $$tags $$unique; \
14834
+ if test $$# -gt 0; then \
14835
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
14836
+ "$$@" $$unique; \
14838
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
14843
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
14844
$(TAGS_FILES) $(LISP)
14846
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
14847
unique=`for i in $$list; do \
14848
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
14850
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
14851
END { if (nonempty) { for (i in files) print i; }; }'`; \
14852
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
14853
+ test -z "$(CTAGS_ARGS)$$unique" \
14854
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
14859
here=`$(am__cd) $(top_builddir) && pwd` \
14860
- && cd $(top_srcdir) \
14861
- && gtags -i $(GTAGS_ARGS) $$here
14862
+ && $(am__cd) $(top_srcdir) \
14863
+ && gtags -i $(GTAGS_ARGS) "$$here"
14866
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
14867
@@ -359,29 +397,44 @@
14868
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
14869
if test -d $$d/$$file; then \
14870
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
14871
+ if test -d "$(distdir)/$$file"; then \
14872
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
14874
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
14875
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
14876
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
14877
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
14879
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
14880
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
14882
- test -f $(distdir)/$$file \
14883
- || cp -p $$d/$$file $(distdir)/$$file \
14884
+ test -f "$(distdir)/$$file" \
14885
+ || cp -p $$d/$$file "$(distdir)/$$file" \
14889
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
14890
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
14891
if test "$$subdir" = .; then :; else \
14892
test -d "$(distdir)/$$subdir" \
14893
|| $(MKDIR_P) "$(distdir)/$$subdir" \
14895
- distdir=`$(am__cd) $(distdir) && pwd`; \
14896
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
14897
- (cd $$subdir && \
14900
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
14901
+ if test "$$subdir" = .; then :; else \
14902
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
14903
+ $(am__relativize); \
14904
+ new_distdir=$$reldir; \
14905
+ dir1=$$subdir; dir2="$(top_distdir)"; \
14906
+ $(am__relativize); \
14907
+ new_top_distdir=$$reldir; \
14908
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
14909
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
14910
+ ($(am__cd) $$subdir && \
14911
$(MAKE) $(AM_MAKEFLAGS) \
14912
- top_distdir="$$top_distdir" \
14913
- distdir="$$distdir/$$subdir" \
14914
+ top_distdir="$$new_top_distdir" \
14915
+ distdir="$$new_distdir" \
14916
am__remove_distdir=: \
14917
am__skip_length_check=: \
14918
+ am__skip_mode_fix=: \
14922
@@ -411,6 +464,7 @@
14925
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
14926
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
14928
maintainer-clean-generic:
14929
@echo "This command is intended for maintainers to use"
14930
@@ -430,6 +484,8 @@
14932
html: html-recursive
14936
info: info-recursive
14939
@@ -438,18 +494,28 @@
14941
install-dvi: install-dvi-recursive
14947
install-html: install-html-recursive
14951
install-info: install-info-recursive
14957
install-pdf: install-pdf-recursive
14961
install-ps: install-ps-recursive
14967
maintainer-clean: maintainer-clean-recursive
14968
@@ -470,8 +536,8 @@
14972
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
14974
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
14975
+ install-am install-strip tags-recursive
14977
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
14978
all all-am check check-am clean clean-generic ctags \
14979
@@ -486,6 +552,7 @@
14980
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
14981
tags-recursive uninstall uninstall-am
14984
# Tell versions [3.59,3.63) of GNU make to not export all variables.
14985
# Otherwise a system limit (for SysV at least) may be exceeded.
14987
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/32x32/mimetypes/Makefile.in gnome-icon-theme-2.27.90.new/32x32/mimetypes/Makefile.in
14988
--- gnome-icon-theme-2.27.90/32x32/mimetypes/Makefile.in 2009-08-27 12:37:22.000000000 +0200
14989
+++ gnome-icon-theme-2.27.90.new/32x32/mimetypes/Makefile.in 2009-08-27 12:38:30.000000000 +0200
14991
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
14992
+# Makefile.in generated by automake 1.11 from Makefile.am.
14993
# @configure_input@
14995
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
14996
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
14997
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
14999
# This Makefile.in is free software; the Free Software Foundation
15000
# gives unlimited permission to copy and/or distribute it,
15001
# with or without modifications, as long as this notice is preserved.
15005
pkgdatadir = $(datadir)/@PACKAGE@
15006
-pkglibdir = $(libdir)/@PACKAGE@
15007
pkgincludedir = $(includedir)/@PACKAGE@
15008
+pkglibdir = $(libdir)/@PACKAGE@
15009
+pkglibexecdir = $(libexecdir)/@PACKAGE@
15010
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
15011
install_sh_DATA = $(install_sh) -c -m 644
15012
install_sh_PROGRAM = $(install_sh) -c
15015
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
15016
CONFIG_CLEAN_FILES =
15017
+CONFIG_CLEAN_VPATH_FILES =
15020
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
15022
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
15025
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
15026
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
15027
+am__install_max = 40
15028
+am__nobase_strip_setup = \
15029
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
15030
+am__nobase_strip = \
15031
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
15032
+am__nobase_list = $(am__nobase_strip_setup); \
15033
+ for p in $$list; do echo "$$p $$p"; done | \
15034
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
15035
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
15036
+ if (++n[$$2] == $(am__install_max)) \
15037
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
15038
+ END { for (dir in files) print dir, files[dir] }'
15040
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
15041
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
15042
am__installdirs = "$(DESTDIR)$(iconsdir)"
15043
-iconsDATA_INSTALL = $(INSTALL_DATA)
15044
DATA = $(icons_DATA)
15045
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
15046
ACLOCAL = @ACLOCAL@
15047
@@ -106,6 +123,7 @@
15048
PACKAGE_NAME = @PACKAGE_NAME@
15049
PACKAGE_STRING = @PACKAGE_STRING@
15050
PACKAGE_TARNAME = @PACKAGE_TARNAME@
15051
+PACKAGE_URL = @PACKAGE_URL@
15052
PACKAGE_VERSION = @PACKAGE_VERSION@
15053
PATH_SEPARATOR = @PATH_SEPARATOR@
15054
PKG_CONFIG = @PKG_CONFIG@
15055
@@ -201,9 +219,9 @@
15059
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 32x32/mimetypes/Makefile'; \
15060
- cd $(top_srcdir) && \
15061
- $(AUTOMAKE) --gnu 32x32/mimetypes/Makefile
15062
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 32x32/mimetypes/Makefile'; \
15063
+ $(am__cd) $(top_srcdir) && \
15064
+ $(AUTOMAKE) --gnu 32x32/mimetypes/Makefile
15065
.PRECIOUS: Makefile
15066
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
15068
@@ -221,23 +239,27 @@
15069
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
15070
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
15071
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
15072
+$(am__aclocal_m4_deps):
15073
install-iconsDATA: $(icons_DATA)
15075
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
15076
- @list='$(icons_DATA)'; for p in $$list; do \
15077
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
15078
+ for p in $$list; do \
15079
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
15080
- f=$(am__strip_dir) \
15081
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
15082
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
15084
+ done | $(am__base_list) | \
15085
+ while read files; do \
15086
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
15087
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
15090
uninstall-iconsDATA:
15091
@$(NORMAL_UNINSTALL)
15092
- @list='$(icons_DATA)'; for p in $$list; do \
15093
- f=$(am__strip_dir) \
15094
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
15095
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
15097
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
15098
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
15099
+ test -n "$$files" || exit 0; \
15100
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
15101
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
15105
@@ -261,13 +283,17 @@
15106
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
15107
if test -d $$d/$$file; then \
15108
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
15109
+ if test -d "$(distdir)/$$file"; then \
15110
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
15112
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
15113
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
15114
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
15115
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
15117
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
15118
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
15120
- test -f $(distdir)/$$file \
15121
- || cp -p $$d/$$file $(distdir)/$$file \
15122
+ test -f "$(distdir)/$$file" \
15123
+ || cp -p $$d/$$file "$(distdir)/$$file" \
15127
@@ -298,6 +324,7 @@
15130
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
15131
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
15133
maintainer-clean-generic:
15134
@echo "This command is intended for maintainers to use"
15135
@@ -316,6 +343,8 @@
15144
@@ -324,18 +353,28 @@
15146
install-dvi: install-dvi-am
15152
install-html: install-html-am
15156
install-info: install-info-am
15162
install-pdf: install-pdf-am
15166
install-ps: install-ps-am
15172
maintainer-clean: maintainer-clean-am
15173
@@ -391,6 +430,7 @@
15178
# Tell versions [3.59,3.63) of GNU make to not export all variables.
15179
# Otherwise a system limit (for SysV at least) may be exceeded.
15181
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/32x32/places/Makefile.in gnome-icon-theme-2.27.90.new/32x32/places/Makefile.in
15182
--- gnome-icon-theme-2.27.90/32x32/places/Makefile.in 2009-08-13 03:45:48.000000000 +0200
15183
+++ gnome-icon-theme-2.27.90.new/32x32/places/Makefile.in 2009-08-27 12:38:30.000000000 +0200
15185
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
15186
+# Makefile.in generated by automake 1.11 from Makefile.am.
15187
# @configure_input@
15189
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
15190
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
15191
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
15193
# This Makefile.in is free software; the Free Software Foundation
15194
# gives unlimited permission to copy and/or distribute it,
15195
# with or without modifications, as long as this notice is preserved.
15199
pkgdatadir = $(datadir)/@PACKAGE@
15200
-pkglibdir = $(libdir)/@PACKAGE@
15201
pkgincludedir = $(includedir)/@PACKAGE@
15202
+pkglibdir = $(libdir)/@PACKAGE@
15203
+pkglibexecdir = $(libexecdir)/@PACKAGE@
15204
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
15205
install_sh_DATA = $(install_sh) -c -m 644
15206
install_sh_PROGRAM = $(install_sh) -c
15209
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
15210
CONFIG_CLEAN_FILES =
15211
+CONFIG_CLEAN_VPATH_FILES =
15214
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
15216
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
15219
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
15220
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
15221
+am__install_max = 40
15222
+am__nobase_strip_setup = \
15223
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
15224
+am__nobase_strip = \
15225
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
15226
+am__nobase_list = $(am__nobase_strip_setup); \
15227
+ for p in $$list; do echo "$$p $$p"; done | \
15228
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
15229
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
15230
+ if (++n[$$2] == $(am__install_max)) \
15231
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
15232
+ END { for (dir in files) print dir, files[dir] }'
15234
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
15235
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
15236
am__installdirs = "$(DESTDIR)$(iconsdir)"
15237
-iconsDATA_INSTALL = $(INSTALL_DATA)
15238
DATA = $(icons_DATA)
15239
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
15240
ACLOCAL = @ACLOCAL@
15241
@@ -106,6 +123,7 @@
15242
PACKAGE_NAME = @PACKAGE_NAME@
15243
PACKAGE_STRING = @PACKAGE_STRING@
15244
PACKAGE_TARNAME = @PACKAGE_TARNAME@
15245
+PACKAGE_URL = @PACKAGE_URL@
15246
PACKAGE_VERSION = @PACKAGE_VERSION@
15247
PATH_SEPARATOR = @PATH_SEPARATOR@
15248
PKG_CONFIG = @PKG_CONFIG@
15249
@@ -196,9 +214,9 @@
15253
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 32x32/places/Makefile'; \
15254
- cd $(top_srcdir) && \
15255
- $(AUTOMAKE) --gnu 32x32/places/Makefile
15256
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 32x32/places/Makefile'; \
15257
+ $(am__cd) $(top_srcdir) && \
15258
+ $(AUTOMAKE) --gnu 32x32/places/Makefile
15259
.PRECIOUS: Makefile
15260
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
15262
@@ -216,23 +234,27 @@
15263
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
15264
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
15265
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
15266
+$(am__aclocal_m4_deps):
15267
install-iconsDATA: $(icons_DATA)
15269
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
15270
- @list='$(icons_DATA)'; for p in $$list; do \
15271
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
15272
+ for p in $$list; do \
15273
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
15274
- f=$(am__strip_dir) \
15275
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
15276
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
15278
+ done | $(am__base_list) | \
15279
+ while read files; do \
15280
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
15281
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
15284
uninstall-iconsDATA:
15285
@$(NORMAL_UNINSTALL)
15286
- @list='$(icons_DATA)'; for p in $$list; do \
15287
- f=$(am__strip_dir) \
15288
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
15289
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
15291
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
15292
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
15293
+ test -n "$$files" || exit 0; \
15294
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
15295
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
15299
@@ -256,13 +278,17 @@
15300
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
15301
if test -d $$d/$$file; then \
15302
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
15303
+ if test -d "$(distdir)/$$file"; then \
15304
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
15306
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
15307
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
15308
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
15309
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
15311
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
15312
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
15314
- test -f $(distdir)/$$file \
15315
- || cp -p $$d/$$file $(distdir)/$$file \
15316
+ test -f "$(distdir)/$$file" \
15317
+ || cp -p $$d/$$file "$(distdir)/$$file" \
15321
@@ -293,6 +319,7 @@
15324
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
15325
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
15327
maintainer-clean-generic:
15328
@echo "This command is intended for maintainers to use"
15329
@@ -312,6 +339,8 @@
15338
@@ -320,18 +349,28 @@
15340
install-dvi: install-dvi-am
15346
install-html: install-html-am
15350
install-info: install-info-am
15356
install-pdf: install-pdf-am
15360
install-ps: install-ps-am
15366
maintainer-clean: maintainer-clean-am
15367
@@ -387,6 +426,7 @@
15372
# Tell versions [3.59,3.63) of GNU make to not export all variables.
15373
# Otherwise a system limit (for SysV at least) may be exceeded.
15375
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/32x32/status/Makefile.in gnome-icon-theme-2.27.90.new/32x32/status/Makefile.in
15376
--- gnome-icon-theme-2.27.90/32x32/status/Makefile.in 2009-08-13 03:45:48.000000000 +0200
15377
+++ gnome-icon-theme-2.27.90.new/32x32/status/Makefile.in 2009-08-27 12:38:30.000000000 +0200
15379
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
15380
+# Makefile.in generated by automake 1.11 from Makefile.am.
15381
# @configure_input@
15383
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
15384
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
15385
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
15387
# This Makefile.in is free software; the Free Software Foundation
15388
# gives unlimited permission to copy and/or distribute it,
15389
# with or without modifications, as long as this notice is preserved.
15393
pkgdatadir = $(datadir)/@PACKAGE@
15394
-pkglibdir = $(libdir)/@PACKAGE@
15395
pkgincludedir = $(includedir)/@PACKAGE@
15396
+pkglibdir = $(libdir)/@PACKAGE@
15397
+pkglibexecdir = $(libexecdir)/@PACKAGE@
15398
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
15399
install_sh_DATA = $(install_sh) -c -m 644
15400
install_sh_PROGRAM = $(install_sh) -c
15403
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
15404
CONFIG_CLEAN_FILES =
15405
+CONFIG_CLEAN_VPATH_FILES =
15408
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
15410
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
15413
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
15414
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
15415
+am__install_max = 40
15416
+am__nobase_strip_setup = \
15417
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
15418
+am__nobase_strip = \
15419
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
15420
+am__nobase_list = $(am__nobase_strip_setup); \
15421
+ for p in $$list; do echo "$$p $$p"; done | \
15422
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
15423
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
15424
+ if (++n[$$2] == $(am__install_max)) \
15425
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
15426
+ END { for (dir in files) print dir, files[dir] }'
15428
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
15429
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
15430
am__installdirs = "$(DESTDIR)$(iconsdir)"
15431
-iconsDATA_INSTALL = $(INSTALL_DATA)
15432
DATA = $(icons_DATA)
15433
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
15434
ACLOCAL = @ACLOCAL@
15435
@@ -106,6 +123,7 @@
15436
PACKAGE_NAME = @PACKAGE_NAME@
15437
PACKAGE_STRING = @PACKAGE_STRING@
15438
PACKAGE_TARNAME = @PACKAGE_TARNAME@
15439
+PACKAGE_URL = @PACKAGE_URL@
15440
PACKAGE_VERSION = @PACKAGE_VERSION@
15441
PATH_SEPARATOR = @PATH_SEPARATOR@
15442
PKG_CONFIG = @PKG_CONFIG@
15443
@@ -236,9 +254,9 @@
15447
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 32x32/status/Makefile'; \
15448
- cd $(top_srcdir) && \
15449
- $(AUTOMAKE) --gnu 32x32/status/Makefile
15450
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 32x32/status/Makefile'; \
15451
+ $(am__cd) $(top_srcdir) && \
15452
+ $(AUTOMAKE) --gnu 32x32/status/Makefile
15453
.PRECIOUS: Makefile
15454
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
15456
@@ -256,23 +274,27 @@
15457
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
15458
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
15459
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
15460
+$(am__aclocal_m4_deps):
15461
install-iconsDATA: $(icons_DATA)
15463
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
15464
- @list='$(icons_DATA)'; for p in $$list; do \
15465
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
15466
+ for p in $$list; do \
15467
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
15468
- f=$(am__strip_dir) \
15469
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
15470
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
15472
+ done | $(am__base_list) | \
15473
+ while read files; do \
15474
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
15475
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
15478
uninstall-iconsDATA:
15479
@$(NORMAL_UNINSTALL)
15480
- @list='$(icons_DATA)'; for p in $$list; do \
15481
- f=$(am__strip_dir) \
15482
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
15483
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
15485
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
15486
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
15487
+ test -n "$$files" || exit 0; \
15488
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
15489
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
15493
@@ -296,13 +318,17 @@
15494
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
15495
if test -d $$d/$$file; then \
15496
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
15497
+ if test -d "$(distdir)/$$file"; then \
15498
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
15500
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
15501
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
15502
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
15503
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
15505
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
15506
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
15508
- test -f $(distdir)/$$file \
15509
- || cp -p $$d/$$file $(distdir)/$$file \
15510
+ test -f "$(distdir)/$$file" \
15511
+ || cp -p $$d/$$file "$(distdir)/$$file" \
15515
@@ -333,6 +359,7 @@
15518
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
15519
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
15521
maintainer-clean-generic:
15522
@echo "This command is intended for maintainers to use"
15523
@@ -352,6 +379,8 @@
15532
@@ -360,18 +389,28 @@
15534
install-dvi: install-dvi-am
15540
install-html: install-html-am
15544
install-info: install-info-am
15550
install-pdf: install-pdf-am
15554
install-ps: install-ps-am
15560
maintainer-clean: maintainer-clean-am
15561
@@ -427,6 +466,7 @@
15566
# Tell versions [3.59,3.63) of GNU make to not export all variables.
15567
# Otherwise a system limit (for SysV at least) may be exceeded.
15569
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/32x32/stock/generic/Makefile.in gnome-icon-theme-2.27.90.new/32x32/stock/generic/Makefile.in
15570
--- gnome-icon-theme-2.27.90/32x32/stock/generic/Makefile.in 2009-08-13 03:45:48.000000000 +0200
15571
+++ gnome-icon-theme-2.27.90.new/32x32/stock/generic/Makefile.in 2009-08-27 12:38:30.000000000 +0200
15573
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
15574
+# Makefile.in generated by automake 1.11 from Makefile.am.
15575
# @configure_input@
15577
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
15578
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
15579
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
15581
# This Makefile.in is free software; the Free Software Foundation
15582
# gives unlimited permission to copy and/or distribute it,
15583
# with or without modifications, as long as this notice is preserved.
15587
pkgdatadir = $(datadir)/@PACKAGE@
15588
-pkglibdir = $(libdir)/@PACKAGE@
15589
pkgincludedir = $(includedir)/@PACKAGE@
15590
+pkglibdir = $(libdir)/@PACKAGE@
15591
+pkglibexecdir = $(libexecdir)/@PACKAGE@
15592
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
15593
install_sh_DATA = $(install_sh) -c -m 644
15594
install_sh_PROGRAM = $(install_sh) -c
15597
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
15598
CONFIG_CLEAN_FILES =
15599
+CONFIG_CLEAN_VPATH_FILES =
15602
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
15604
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
15607
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
15608
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
15609
+am__install_max = 40
15610
+am__nobase_strip_setup = \
15611
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
15612
+am__nobase_strip = \
15613
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
15614
+am__nobase_list = $(am__nobase_strip_setup); \
15615
+ for p in $$list; do echo "$$p $$p"; done | \
15616
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
15617
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
15618
+ if (++n[$$2] == $(am__install_max)) \
15619
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
15620
+ END { for (dir in files) print dir, files[dir] }'
15622
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
15623
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
15624
am__installdirs = "$(DESTDIR)$(icondir)"
15625
-iconDATA_INSTALL = $(INSTALL_DATA)
15626
DATA = $(icon_DATA)
15627
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
15628
ACLOCAL = @ACLOCAL@
15629
@@ -106,6 +123,7 @@
15630
PACKAGE_NAME = @PACKAGE_NAME@
15631
PACKAGE_STRING = @PACKAGE_STRING@
15632
PACKAGE_TARNAME = @PACKAGE_TARNAME@
15633
+PACKAGE_URL = @PACKAGE_URL@
15634
PACKAGE_VERSION = @PACKAGE_VERSION@
15635
PATH_SEPARATOR = @PATH_SEPARATOR@
15636
PKG_CONFIG = @PKG_CONFIG@
15637
@@ -184,9 +202,9 @@
15641
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 32x32/stock/generic/Makefile'; \
15642
- cd $(top_srcdir) && \
15643
- $(AUTOMAKE) --gnu 32x32/stock/generic/Makefile
15644
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 32x32/stock/generic/Makefile'; \
15645
+ $(am__cd) $(top_srcdir) && \
15646
+ $(AUTOMAKE) --gnu 32x32/stock/generic/Makefile
15647
.PRECIOUS: Makefile
15648
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
15650
@@ -204,23 +222,27 @@
15651
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
15652
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
15653
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
15654
+$(am__aclocal_m4_deps):
15655
install-iconDATA: $(icon_DATA)
15657
test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
15658
- @list='$(icon_DATA)'; for p in $$list; do \
15659
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
15660
+ for p in $$list; do \
15661
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
15662
- f=$(am__strip_dir) \
15663
- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
15664
- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
15666
+ done | $(am__base_list) | \
15667
+ while read files; do \
15668
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
15669
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
15672
uninstall-iconDATA:
15673
@$(NORMAL_UNINSTALL)
15674
- @list='$(icon_DATA)'; for p in $$list; do \
15675
- f=$(am__strip_dir) \
15676
- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
15677
- rm -f "$(DESTDIR)$(icondir)/$$f"; \
15679
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
15680
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
15681
+ test -n "$$files" || exit 0; \
15682
+ echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
15683
+ cd "$(DESTDIR)$(icondir)" && rm -f $$files
15687
@@ -244,13 +266,17 @@
15688
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
15689
if test -d $$d/$$file; then \
15690
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
15691
+ if test -d "$(distdir)/$$file"; then \
15692
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
15694
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
15695
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
15696
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
15697
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
15699
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
15700
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
15702
- test -f $(distdir)/$$file \
15703
- || cp -p $$d/$$file $(distdir)/$$file \
15704
+ test -f "$(distdir)/$$file" \
15705
+ || cp -p $$d/$$file "$(distdir)/$$file" \
15709
@@ -281,6 +307,7 @@
15712
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
15713
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
15715
maintainer-clean-generic:
15716
@echo "This command is intended for maintainers to use"
15717
@@ -299,6 +326,8 @@
15726
@@ -307,18 +336,28 @@
15728
install-dvi: install-dvi-am
15734
install-html: install-html-am
15738
install-info: install-info-am
15744
install-pdf: install-pdf-am
15748
install-ps: install-ps-am
15754
maintainer-clean: maintainer-clean-am
15755
@@ -352,6 +391,7 @@
15756
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
15757
uninstall-am uninstall-iconDATA
15760
# Tell versions [3.59,3.63) of GNU make to not export all variables.
15761
# Otherwise a system limit (for SysV at least) may be exceeded.
15763
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/32x32/stock/Makefile.in gnome-icon-theme-2.27.90.new/32x32/stock/Makefile.in
15764
--- gnome-icon-theme-2.27.90/32x32/stock/Makefile.in 2009-08-13 03:45:48.000000000 +0200
15765
+++ gnome-icon-theme-2.27.90.new/32x32/stock/Makefile.in 2009-08-27 12:38:30.000000000 +0200
15767
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
15768
+# Makefile.in generated by automake 1.11 from Makefile.am.
15769
# @configure_input@
15771
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
15772
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
15773
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
15775
# This Makefile.in is free software; the Free Software Foundation
15776
# gives unlimited permission to copy and/or distribute it,
15777
# with or without modifications, as long as this notice is preserved.
15781
pkgdatadir = $(datadir)/@PACKAGE@
15782
-pkglibdir = $(libdir)/@PACKAGE@
15783
pkgincludedir = $(includedir)/@PACKAGE@
15784
+pkglibdir = $(libdir)/@PACKAGE@
15785
+pkglibexecdir = $(libexecdir)/@PACKAGE@
15786
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
15787
install_sh_DATA = $(install_sh) -c -m 644
15788
install_sh_PROGRAM = $(install_sh) -c
15791
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
15792
CONFIG_CLEAN_FILES =
15793
+CONFIG_CLEAN_VPATH_FILES =
15796
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
15797
@@ -48,10 +51,38 @@
15798
ps-recursive uninstall-recursive
15799
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
15800
distclean-recursive maintainer-clean-recursive
15801
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
15802
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
15806
DIST_SUBDIRS = $(SUBDIRS)
15807
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
15808
+am__relativize = \
15810
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
15811
+ sed_rest='s,^[^/]*/*,,'; \
15812
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
15813
+ sed_butlast='s,/*[^/]*$$,,'; \
15814
+ while test -n "$$dir1"; do \
15815
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
15816
+ if test "$$first" != "."; then \
15817
+ if test "$$first" = ".."; then \
15818
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
15819
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
15821
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
15822
+ if test "$$first2" = "$$first"; then \
15823
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
15825
+ dir2="../$$dir2"; \
15827
+ dir0="$$dir0"/"$$first"; \
15830
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
15833
ACLOCAL = @ACLOCAL@
15834
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
15835
ALL_LINGUAS = @ALL_LINGUAS@
15836
@@ -108,6 +139,7 @@
15837
PACKAGE_NAME = @PACKAGE_NAME@
15838
PACKAGE_STRING = @PACKAGE_STRING@
15839
PACKAGE_TARNAME = @PACKAGE_TARNAME@
15840
+PACKAGE_URL = @PACKAGE_URL@
15841
PACKAGE_VERSION = @PACKAGE_VERSION@
15842
PATH_SEPARATOR = @PATH_SEPARATOR@
15843
PKG_CONFIG = @PKG_CONFIG@
15844
@@ -177,9 +209,9 @@
15848
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 32x32/stock/Makefile'; \
15849
- cd $(top_srcdir) && \
15850
- $(AUTOMAKE) --gnu 32x32/stock/Makefile
15851
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 32x32/stock/Makefile'; \
15852
+ $(am__cd) $(top_srcdir) && \
15853
+ $(AUTOMAKE) --gnu 32x32/stock/Makefile
15854
.PRECIOUS: Makefile
15855
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
15857
@@ -197,6 +229,7 @@
15858
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
15859
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
15860
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
15861
+$(am__aclocal_m4_deps):
15863
# This directory's subdirectories are mostly independent; you can cd
15864
# into them and run `make' without going through this Makefile.
15865
@@ -222,7 +255,7 @@
15867
local_target="$$target"; \
15869
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
15870
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
15871
|| eval $$failcom; \
15873
if test "$$dot_seen" = "no"; then \
15874
@@ -256,16 +289,16 @@
15876
local_target="$$target"; \
15878
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
15879
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
15880
|| eval $$failcom; \
15881
done && test -z "$$fail"
15883
list='$(SUBDIRS)'; for subdir in $$list; do \
15884
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
15885
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
15888
list='$(SUBDIRS)'; for subdir in $$list; do \
15889
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
15890
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
15893
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
15894
@@ -280,7 +313,7 @@
15896
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
15897
$(TAGS_FILES) $(LISP)
15901
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
15902
include_option=--etags-include; \
15903
@@ -292,7 +325,7 @@
15904
list='$(SUBDIRS)'; for subdir in $$list; do \
15905
if test "$$subdir" = .; then :; else \
15906
test ! -f $$subdir/TAGS || \
15907
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
15908
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
15911
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
15912
@@ -301,29 +334,34 @@
15914
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
15915
END { if (nonempty) { for (i in files) print i; }; }'`; \
15916
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
15918
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
15919
test -n "$$unique" || unique=$$empty_fix; \
15920
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
15921
- $$tags $$unique; \
15922
+ if test $$# -gt 0; then \
15923
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
15924
+ "$$@" $$unique; \
15926
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
15931
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
15932
$(TAGS_FILES) $(LISP)
15934
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
15935
unique=`for i in $$list; do \
15936
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
15938
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
15939
END { if (nonempty) { for (i in files) print i; }; }'`; \
15940
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
15941
+ test -z "$(CTAGS_ARGS)$$unique" \
15942
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
15947
here=`$(am__cd) $(top_builddir) && pwd` \
15948
- && cd $(top_srcdir) \
15949
- && gtags -i $(GTAGS_ARGS) $$here
15950
+ && $(am__cd) $(top_srcdir) \
15951
+ && gtags -i $(GTAGS_ARGS) "$$here"
15954
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
15955
@@ -344,29 +382,44 @@
15956
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
15957
if test -d $$d/$$file; then \
15958
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
15959
+ if test -d "$(distdir)/$$file"; then \
15960
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
15962
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
15963
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
15964
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
15965
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
15967
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
15968
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
15970
- test -f $(distdir)/$$file \
15971
- || cp -p $$d/$$file $(distdir)/$$file \
15972
+ test -f "$(distdir)/$$file" \
15973
+ || cp -p $$d/$$file "$(distdir)/$$file" \
15977
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
15978
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
15979
if test "$$subdir" = .; then :; else \
15980
test -d "$(distdir)/$$subdir" \
15981
|| $(MKDIR_P) "$(distdir)/$$subdir" \
15983
- distdir=`$(am__cd) $(distdir) && pwd`; \
15984
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
15985
- (cd $$subdir && \
15988
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
15989
+ if test "$$subdir" = .; then :; else \
15990
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
15991
+ $(am__relativize); \
15992
+ new_distdir=$$reldir; \
15993
+ dir1=$$subdir; dir2="$(top_distdir)"; \
15994
+ $(am__relativize); \
15995
+ new_top_distdir=$$reldir; \
15996
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
15997
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
15998
+ ($(am__cd) $$subdir && \
15999
$(MAKE) $(AM_MAKEFLAGS) \
16000
- top_distdir="$$top_distdir" \
16001
- distdir="$$distdir/$$subdir" \
16002
+ top_distdir="$$new_top_distdir" \
16003
+ distdir="$$new_distdir" \
16004
am__remove_distdir=: \
16005
am__skip_length_check=: \
16006
+ am__skip_mode_fix=: \
16010
@@ -396,6 +449,7 @@
16013
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
16014
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
16016
maintainer-clean-generic:
16017
@echo "This command is intended for maintainers to use"
16018
@@ -414,6 +468,8 @@
16020
html: html-recursive
16024
info: info-recursive
16027
@@ -422,18 +478,28 @@
16029
install-dvi: install-dvi-recursive
16035
install-html: install-html-recursive
16039
install-info: install-info-recursive
16045
install-pdf: install-pdf-recursive
16049
install-ps: install-ps-recursive
16055
maintainer-clean: maintainer-clean-recursive
16056
@@ -454,8 +520,8 @@
16060
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
16062
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
16063
+ install-am install-strip tags-recursive
16065
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
16066
all all-am check check-am clean clean-generic ctags \
16067
@@ -470,6 +536,7 @@
16068
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
16069
tags-recursive uninstall uninstall-am
16072
# Tell versions [3.59,3.63) of GNU make to not export all variables.
16073
# Otherwise a system limit (for SysV at least) may be exceeded.
16075
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/48x48/actions/Makefile.in gnome-icon-theme-2.27.90.new/48x48/actions/Makefile.in
16076
--- gnome-icon-theme-2.27.90/48x48/actions/Makefile.in 2009-08-13 03:45:49.000000000 +0200
16077
+++ gnome-icon-theme-2.27.90.new/48x48/actions/Makefile.in 2009-08-27 12:38:30.000000000 +0200
16079
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
16080
+# Makefile.in generated by automake 1.11 from Makefile.am.
16081
# @configure_input@
16083
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
16084
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
16085
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
16087
# This Makefile.in is free software; the Free Software Foundation
16088
# gives unlimited permission to copy and/or distribute it,
16089
# with or without modifications, as long as this notice is preserved.
16093
pkgdatadir = $(datadir)/@PACKAGE@
16094
-pkglibdir = $(libdir)/@PACKAGE@
16095
pkgincludedir = $(includedir)/@PACKAGE@
16096
+pkglibdir = $(libdir)/@PACKAGE@
16097
+pkglibexecdir = $(libexecdir)/@PACKAGE@
16098
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
16099
install_sh_DATA = $(install_sh) -c -m 644
16100
install_sh_PROGRAM = $(install_sh) -c
16103
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
16104
CONFIG_CLEAN_FILES =
16105
+CONFIG_CLEAN_VPATH_FILES =
16108
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
16110
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
16113
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
16114
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
16115
+am__install_max = 40
16116
+am__nobase_strip_setup = \
16117
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
16118
+am__nobase_strip = \
16119
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
16120
+am__nobase_list = $(am__nobase_strip_setup); \
16121
+ for p in $$list; do echo "$$p $$p"; done | \
16122
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
16123
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
16124
+ if (++n[$$2] == $(am__install_max)) \
16125
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
16126
+ END { for (dir in files) print dir, files[dir] }'
16128
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
16129
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
16130
am__installdirs = "$(DESTDIR)$(iconsdir)"
16131
-iconsDATA_INSTALL = $(INSTALL_DATA)
16132
DATA = $(icons_DATA)
16133
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
16134
ACLOCAL = @ACLOCAL@
16135
@@ -106,6 +123,7 @@
16136
PACKAGE_NAME = @PACKAGE_NAME@
16137
PACKAGE_STRING = @PACKAGE_STRING@
16138
PACKAGE_TARNAME = @PACKAGE_TARNAME@
16139
+PACKAGE_URL = @PACKAGE_URL@
16140
PACKAGE_VERSION = @PACKAGE_VERSION@
16141
PATH_SEPARATOR = @PATH_SEPARATOR@
16142
PKG_CONFIG = @PKG_CONFIG@
16143
@@ -187,9 +205,9 @@
16147
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 48x48/actions/Makefile'; \
16148
- cd $(top_srcdir) && \
16149
- $(AUTOMAKE) --gnu 48x48/actions/Makefile
16150
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 48x48/actions/Makefile'; \
16151
+ $(am__cd) $(top_srcdir) && \
16152
+ $(AUTOMAKE) --gnu 48x48/actions/Makefile
16153
.PRECIOUS: Makefile
16154
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
16156
@@ -207,23 +225,27 @@
16157
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
16158
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
16159
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
16160
+$(am__aclocal_m4_deps):
16161
install-iconsDATA: $(icons_DATA)
16163
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
16164
- @list='$(icons_DATA)'; for p in $$list; do \
16165
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
16166
+ for p in $$list; do \
16167
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
16168
- f=$(am__strip_dir) \
16169
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
16170
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
16172
+ done | $(am__base_list) | \
16173
+ while read files; do \
16174
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
16175
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
16178
uninstall-iconsDATA:
16179
@$(NORMAL_UNINSTALL)
16180
- @list='$(icons_DATA)'; for p in $$list; do \
16181
- f=$(am__strip_dir) \
16182
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
16183
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
16185
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
16186
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
16187
+ test -n "$$files" || exit 0; \
16188
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
16189
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
16193
@@ -247,13 +269,17 @@
16194
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
16195
if test -d $$d/$$file; then \
16196
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
16197
+ if test -d "$(distdir)/$$file"; then \
16198
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
16200
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
16201
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
16202
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
16203
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
16205
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
16206
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
16208
- test -f $(distdir)/$$file \
16209
- || cp -p $$d/$$file $(distdir)/$$file \
16210
+ test -f "$(distdir)/$$file" \
16211
+ || cp -p $$d/$$file "$(distdir)/$$file" \
16215
@@ -284,6 +310,7 @@
16218
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
16219
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
16221
maintainer-clean-generic:
16222
@echo "This command is intended for maintainers to use"
16223
@@ -303,6 +330,8 @@
16232
@@ -311,18 +340,28 @@
16234
install-dvi: install-dvi-am
16240
install-html: install-html-am
16244
install-info: install-info-am
16250
install-pdf: install-pdf-am
16254
install-ps: install-ps-am
16260
maintainer-clean: maintainer-clean-am
16261
@@ -359,6 +398,7 @@
16263
install-data-local: install-iconsDATA
16264
(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
16266
# Tell versions [3.59,3.63) of GNU make to not export all variables.
16267
# Otherwise a system limit (for SysV at least) may be exceeded.
16269
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/48x48/animations/Makefile.in gnome-icon-theme-2.27.90.new/48x48/animations/Makefile.in
16270
--- gnome-icon-theme-2.27.90/48x48/animations/Makefile.in 2009-08-13 03:45:49.000000000 +0200
16271
+++ gnome-icon-theme-2.27.90.new/48x48/animations/Makefile.in 2009-08-27 12:38:30.000000000 +0200
16273
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
16274
+# Makefile.in generated by automake 1.11 from Makefile.am.
16275
# @configure_input@
16277
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
16278
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
16279
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
16281
# This Makefile.in is free software; the Free Software Foundation
16282
# gives unlimited permission to copy and/or distribute it,
16283
# with or without modifications, as long as this notice is preserved.
16287
pkgdatadir = $(datadir)/@PACKAGE@
16288
-pkglibdir = $(libdir)/@PACKAGE@
16289
pkgincludedir = $(includedir)/@PACKAGE@
16290
+pkglibdir = $(libdir)/@PACKAGE@
16291
+pkglibexecdir = $(libexecdir)/@PACKAGE@
16292
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
16293
install_sh_DATA = $(install_sh) -c -m 644
16294
install_sh_PROGRAM = $(install_sh) -c
16297
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
16298
CONFIG_CLEAN_FILES =
16299
+CONFIG_CLEAN_VPATH_FILES =
16302
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
16304
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
16307
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
16308
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
16309
+am__install_max = 40
16310
+am__nobase_strip_setup = \
16311
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
16312
+am__nobase_strip = \
16313
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
16314
+am__nobase_list = $(am__nobase_strip_setup); \
16315
+ for p in $$list; do echo "$$p $$p"; done | \
16316
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
16317
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
16318
+ if (++n[$$2] == $(am__install_max)) \
16319
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
16320
+ END { for (dir in files) print dir, files[dir] }'
16322
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
16323
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
16324
am__installdirs = "$(DESTDIR)$(iconsdir)"
16325
-iconsDATA_INSTALL = $(INSTALL_DATA)
16326
DATA = $(icons_DATA)
16327
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
16328
ACLOCAL = @ACLOCAL@
16329
@@ -106,6 +123,7 @@
16330
PACKAGE_NAME = @PACKAGE_NAME@
16331
PACKAGE_STRING = @PACKAGE_STRING@
16332
PACKAGE_TARNAME = @PACKAGE_TARNAME@
16333
+PACKAGE_URL = @PACKAGE_URL@
16334
PACKAGE_VERSION = @PACKAGE_VERSION@
16335
PATH_SEPARATOR = @PATH_SEPARATOR@
16336
PKG_CONFIG = @PKG_CONFIG@
16337
@@ -186,9 +204,9 @@
16341
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 48x48/animations/Makefile'; \
16342
- cd $(top_srcdir) && \
16343
- $(AUTOMAKE) --gnu 48x48/animations/Makefile
16344
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 48x48/animations/Makefile'; \
16345
+ $(am__cd) $(top_srcdir) && \
16346
+ $(AUTOMAKE) --gnu 48x48/animations/Makefile
16347
.PRECIOUS: Makefile
16348
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
16350
@@ -206,23 +224,27 @@
16351
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
16352
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
16353
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
16354
+$(am__aclocal_m4_deps):
16355
install-iconsDATA: $(icons_DATA)
16357
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
16358
- @list='$(icons_DATA)'; for p in $$list; do \
16359
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
16360
+ for p in $$list; do \
16361
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
16362
- f=$(am__strip_dir) \
16363
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
16364
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
16366
+ done | $(am__base_list) | \
16367
+ while read files; do \
16368
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
16369
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
16372
uninstall-iconsDATA:
16373
@$(NORMAL_UNINSTALL)
16374
- @list='$(icons_DATA)'; for p in $$list; do \
16375
- f=$(am__strip_dir) \
16376
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
16377
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
16379
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
16380
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
16381
+ test -n "$$files" || exit 0; \
16382
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
16383
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
16387
@@ -246,13 +268,17 @@
16388
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
16389
if test -d $$d/$$file; then \
16390
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
16391
+ if test -d "$(distdir)/$$file"; then \
16392
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
16394
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
16395
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
16396
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
16397
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
16399
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
16400
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
16402
- test -f $(distdir)/$$file \
16403
- || cp -p $$d/$$file $(distdir)/$$file \
16404
+ test -f "$(distdir)/$$file" \
16405
+ || cp -p $$d/$$file "$(distdir)/$$file" \
16409
@@ -283,6 +309,7 @@
16412
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
16413
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
16415
maintainer-clean-generic:
16416
@echo "This command is intended for maintainers to use"
16417
@@ -302,6 +329,8 @@
16426
@@ -310,18 +339,28 @@
16428
install-dvi: install-dvi-am
16434
install-html: install-html-am
16438
install-info: install-info-am
16444
install-pdf: install-pdf-am
16448
install-ps: install-ps-am
16454
maintainer-clean: maintainer-clean-am
16455
@@ -358,6 +397,7 @@
16457
install-data-local: install-iconsDATA
16458
(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
16460
# Tell versions [3.59,3.63) of GNU make to not export all variables.
16461
# Otherwise a system limit (for SysV at least) may be exceeded.
16463
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/48x48/apps/Makefile.in gnome-icon-theme-2.27.90.new/48x48/apps/Makefile.in
16464
--- gnome-icon-theme-2.27.90/48x48/apps/Makefile.in 2009-08-13 03:45:49.000000000 +0200
16465
+++ gnome-icon-theme-2.27.90.new/48x48/apps/Makefile.in 2009-08-27 12:38:30.000000000 +0200
16467
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
16468
+# Makefile.in generated by automake 1.11 from Makefile.am.
16469
# @configure_input@
16471
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
16472
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
16473
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
16475
# This Makefile.in is free software; the Free Software Foundation
16476
# gives unlimited permission to copy and/or distribute it,
16477
# with or without modifications, as long as this notice is preserved.
16481
pkgdatadir = $(datadir)/@PACKAGE@
16482
-pkglibdir = $(libdir)/@PACKAGE@
16483
pkgincludedir = $(includedir)/@PACKAGE@
16484
+pkglibdir = $(libdir)/@PACKAGE@
16485
+pkglibexecdir = $(libexecdir)/@PACKAGE@
16486
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
16487
install_sh_DATA = $(install_sh) -c -m 644
16488
install_sh_PROGRAM = $(install_sh) -c
16491
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
16492
CONFIG_CLEAN_FILES =
16493
+CONFIG_CLEAN_VPATH_FILES =
16496
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
16498
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
16501
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
16502
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
16503
+am__install_max = 40
16504
+am__nobase_strip_setup = \
16505
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
16506
+am__nobase_strip = \
16507
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
16508
+am__nobase_list = $(am__nobase_strip_setup); \
16509
+ for p in $$list; do echo "$$p $$p"; done | \
16510
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
16511
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
16512
+ if (++n[$$2] == $(am__install_max)) \
16513
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
16514
+ END { for (dir in files) print dir, files[dir] }'
16516
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
16517
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
16518
am__installdirs = "$(DESTDIR)$(iconsdir)"
16519
-iconsDATA_INSTALL = $(INSTALL_DATA)
16520
DATA = $(icons_DATA)
16521
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
16522
ACLOCAL = @ACLOCAL@
16523
@@ -106,6 +123,7 @@
16524
PACKAGE_NAME = @PACKAGE_NAME@
16525
PACKAGE_STRING = @PACKAGE_STRING@
16526
PACKAGE_TARNAME = @PACKAGE_TARNAME@
16527
+PACKAGE_URL = @PACKAGE_URL@
16528
PACKAGE_VERSION = @PACKAGE_VERSION@
16529
PATH_SEPARATOR = @PATH_SEPARATOR@
16530
PKG_CONFIG = @PKG_CONFIG@
16531
@@ -189,9 +207,9 @@
16535
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 48x48/apps/Makefile'; \
16536
- cd $(top_srcdir) && \
16537
- $(AUTOMAKE) --gnu 48x48/apps/Makefile
16538
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 48x48/apps/Makefile'; \
16539
+ $(am__cd) $(top_srcdir) && \
16540
+ $(AUTOMAKE) --gnu 48x48/apps/Makefile
16541
.PRECIOUS: Makefile
16542
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
16544
@@ -209,23 +227,27 @@
16545
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
16546
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
16547
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
16548
+$(am__aclocal_m4_deps):
16549
install-iconsDATA: $(icons_DATA)
16551
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
16552
- @list='$(icons_DATA)'; for p in $$list; do \
16553
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
16554
+ for p in $$list; do \
16555
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
16556
- f=$(am__strip_dir) \
16557
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
16558
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
16560
+ done | $(am__base_list) | \
16561
+ while read files; do \
16562
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
16563
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
16566
uninstall-iconsDATA:
16567
@$(NORMAL_UNINSTALL)
16568
- @list='$(icons_DATA)'; for p in $$list; do \
16569
- f=$(am__strip_dir) \
16570
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
16571
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
16573
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
16574
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
16575
+ test -n "$$files" || exit 0; \
16576
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
16577
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
16581
@@ -249,13 +271,17 @@
16582
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
16583
if test -d $$d/$$file; then \
16584
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
16585
+ if test -d "$(distdir)/$$file"; then \
16586
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
16588
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
16589
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
16590
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
16591
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
16593
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
16594
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
16596
- test -f $(distdir)/$$file \
16597
- || cp -p $$d/$$file $(distdir)/$$file \
16598
+ test -f "$(distdir)/$$file" \
16599
+ || cp -p $$d/$$file "$(distdir)/$$file" \
16603
@@ -286,6 +312,7 @@
16606
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
16607
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
16609
maintainer-clean-generic:
16610
@echo "This command is intended for maintainers to use"
16611
@@ -305,6 +332,8 @@
16620
@@ -313,18 +342,28 @@
16622
install-dvi: install-dvi-am
16628
install-html: install-html-am
16632
install-info: install-info-am
16638
install-pdf: install-pdf-am
16642
install-ps: install-ps-am
16648
maintainer-clean: maintainer-clean-am
16649
@@ -361,6 +400,7 @@
16651
install-data-local: install-iconsDATA
16652
(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
16654
# Tell versions [3.59,3.63) of GNU make to not export all variables.
16655
# Otherwise a system limit (for SysV at least) may be exceeded.
16657
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/48x48/devices/Makefile.in gnome-icon-theme-2.27.90.new/48x48/devices/Makefile.in
16658
--- gnome-icon-theme-2.27.90/48x48/devices/Makefile.in 2009-08-13 03:45:49.000000000 +0200
16659
+++ gnome-icon-theme-2.27.90.new/48x48/devices/Makefile.in 2009-08-27 12:38:31.000000000 +0200
16661
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
16662
+# Makefile.in generated by automake 1.11 from Makefile.am.
16663
# @configure_input@
16665
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
16666
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
16667
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
16669
# This Makefile.in is free software; the Free Software Foundation
16670
# gives unlimited permission to copy and/or distribute it,
16671
# with or without modifications, as long as this notice is preserved.
16675
pkgdatadir = $(datadir)/@PACKAGE@
16676
-pkglibdir = $(libdir)/@PACKAGE@
16677
pkgincludedir = $(includedir)/@PACKAGE@
16678
+pkglibdir = $(libdir)/@PACKAGE@
16679
+pkglibexecdir = $(libexecdir)/@PACKAGE@
16680
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
16681
install_sh_DATA = $(install_sh) -c -m 644
16682
install_sh_PROGRAM = $(install_sh) -c
16685
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
16686
CONFIG_CLEAN_FILES =
16687
+CONFIG_CLEAN_VPATH_FILES =
16690
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
16692
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
16695
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
16696
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
16697
+am__install_max = 40
16698
+am__nobase_strip_setup = \
16699
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
16700
+am__nobase_strip = \
16701
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
16702
+am__nobase_list = $(am__nobase_strip_setup); \
16703
+ for p in $$list; do echo "$$p $$p"; done | \
16704
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
16705
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
16706
+ if (++n[$$2] == $(am__install_max)) \
16707
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
16708
+ END { for (dir in files) print dir, files[dir] }'
16710
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
16711
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
16712
am__installdirs = "$(DESTDIR)$(iconsdir)"
16713
-iconsDATA_INSTALL = $(INSTALL_DATA)
16714
DATA = $(icons_DATA)
16715
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
16716
ACLOCAL = @ACLOCAL@
16717
@@ -106,6 +123,7 @@
16718
PACKAGE_NAME = @PACKAGE_NAME@
16719
PACKAGE_STRING = @PACKAGE_STRING@
16720
PACKAGE_TARNAME = @PACKAGE_TARNAME@
16721
+PACKAGE_URL = @PACKAGE_URL@
16722
PACKAGE_VERSION = @PACKAGE_VERSION@
16723
PATH_SEPARATOR = @PATH_SEPARATOR@
16724
PKG_CONFIG = @PKG_CONFIG@
16725
@@ -183,9 +201,9 @@
16729
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 48x48/devices/Makefile'; \
16730
- cd $(top_srcdir) && \
16731
- $(AUTOMAKE) --gnu 48x48/devices/Makefile
16732
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 48x48/devices/Makefile'; \
16733
+ $(am__cd) $(top_srcdir) && \
16734
+ $(AUTOMAKE) --gnu 48x48/devices/Makefile
16735
.PRECIOUS: Makefile
16736
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
16738
@@ -203,23 +221,27 @@
16739
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
16740
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
16741
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
16742
+$(am__aclocal_m4_deps):
16743
install-iconsDATA: $(icons_DATA)
16745
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
16746
- @list='$(icons_DATA)'; for p in $$list; do \
16747
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
16748
+ for p in $$list; do \
16749
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
16750
- f=$(am__strip_dir) \
16751
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
16752
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
16754
+ done | $(am__base_list) | \
16755
+ while read files; do \
16756
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
16757
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
16760
uninstall-iconsDATA:
16761
@$(NORMAL_UNINSTALL)
16762
- @list='$(icons_DATA)'; for p in $$list; do \
16763
- f=$(am__strip_dir) \
16764
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
16765
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
16767
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
16768
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
16769
+ test -n "$$files" || exit 0; \
16770
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
16771
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
16775
@@ -243,13 +265,17 @@
16776
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
16777
if test -d $$d/$$file; then \
16778
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
16779
+ if test -d "$(distdir)/$$file"; then \
16780
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
16782
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
16783
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
16784
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
16785
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
16787
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
16788
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
16790
- test -f $(distdir)/$$file \
16791
- || cp -p $$d/$$file $(distdir)/$$file \
16792
+ test -f "$(distdir)/$$file" \
16793
+ || cp -p $$d/$$file "$(distdir)/$$file" \
16797
@@ -280,6 +306,7 @@
16800
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
16801
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
16803
maintainer-clean-generic:
16804
@echo "This command is intended for maintainers to use"
16805
@@ -298,6 +325,8 @@
16814
@@ -306,18 +335,28 @@
16816
install-dvi: install-dvi-am
16822
install-html: install-html-am
16826
install-info: install-info-am
16832
install-pdf: install-pdf-am
16836
install-ps: install-ps-am
16842
maintainer-clean: maintainer-clean-am
16843
@@ -354,6 +393,7 @@
16845
install-data-local: install-iconsDATA
16846
(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
16848
# Tell versions [3.59,3.63) of GNU make to not export all variables.
16849
# Otherwise a system limit (for SysV at least) may be exceeded.
16851
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/48x48/filesystems/Makefile.in gnome-icon-theme-2.27.90.new/48x48/filesystems/Makefile.in
16852
--- gnome-icon-theme-2.27.90/48x48/filesystems/Makefile.in 2009-08-13 03:45:49.000000000 +0200
16853
+++ gnome-icon-theme-2.27.90.new/48x48/filesystems/Makefile.in 2009-08-27 12:38:31.000000000 +0200
16855
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
16856
+# Makefile.in generated by automake 1.11 from Makefile.am.
16857
# @configure_input@
16859
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
16860
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
16861
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
16863
# This Makefile.in is free software; the Free Software Foundation
16864
# gives unlimited permission to copy and/or distribute it,
16865
# with or without modifications, as long as this notice is preserved.
16869
pkgdatadir = $(datadir)/@PACKAGE@
16870
-pkglibdir = $(libdir)/@PACKAGE@
16871
pkgincludedir = $(includedir)/@PACKAGE@
16872
+pkglibdir = $(libdir)/@PACKAGE@
16873
+pkglibexecdir = $(libexecdir)/@PACKAGE@
16874
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
16875
install_sh_DATA = $(install_sh) -c -m 644
16876
install_sh_PROGRAM = $(install_sh) -c
16879
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
16880
CONFIG_CLEAN_FILES =
16881
+CONFIG_CLEAN_VPATH_FILES =
16884
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
16886
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
16889
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
16890
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
16891
+am__install_max = 40
16892
+am__nobase_strip_setup = \
16893
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
16894
+am__nobase_strip = \
16895
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
16896
+am__nobase_list = $(am__nobase_strip_setup); \
16897
+ for p in $$list; do echo "$$p $$p"; done | \
16898
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
16899
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
16900
+ if (++n[$$2] == $(am__install_max)) \
16901
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
16902
+ END { for (dir in files) print dir, files[dir] }'
16904
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
16905
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
16906
am__installdirs = "$(DESTDIR)$(iconsdir)"
16907
-iconsDATA_INSTALL = $(INSTALL_DATA)
16908
DATA = $(icons_DATA)
16909
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
16910
ACLOCAL = @ACLOCAL@
16911
@@ -106,6 +123,7 @@
16912
PACKAGE_NAME = @PACKAGE_NAME@
16913
PACKAGE_STRING = @PACKAGE_STRING@
16914
PACKAGE_TARNAME = @PACKAGE_TARNAME@
16915
+PACKAGE_URL = @PACKAGE_URL@
16916
PACKAGE_VERSION = @PACKAGE_VERSION@
16917
PATH_SEPARATOR = @PATH_SEPARATOR@
16918
PKG_CONFIG = @PKG_CONFIG@
16919
@@ -187,9 +205,9 @@
16923
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 48x48/filesystems/Makefile'; \
16924
- cd $(top_srcdir) && \
16925
- $(AUTOMAKE) --gnu 48x48/filesystems/Makefile
16926
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 48x48/filesystems/Makefile'; \
16927
+ $(am__cd) $(top_srcdir) && \
16928
+ $(AUTOMAKE) --gnu 48x48/filesystems/Makefile
16929
.PRECIOUS: Makefile
16930
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
16932
@@ -207,23 +225,27 @@
16933
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
16934
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
16935
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
16936
+$(am__aclocal_m4_deps):
16937
install-iconsDATA: $(icons_DATA)
16939
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
16940
- @list='$(icons_DATA)'; for p in $$list; do \
16941
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
16942
+ for p in $$list; do \
16943
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
16944
- f=$(am__strip_dir) \
16945
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
16946
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
16948
+ done | $(am__base_list) | \
16949
+ while read files; do \
16950
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
16951
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
16954
uninstall-iconsDATA:
16955
@$(NORMAL_UNINSTALL)
16956
- @list='$(icons_DATA)'; for p in $$list; do \
16957
- f=$(am__strip_dir) \
16958
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
16959
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
16961
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
16962
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
16963
+ test -n "$$files" || exit 0; \
16964
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
16965
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
16969
@@ -247,13 +269,17 @@
16970
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
16971
if test -d $$d/$$file; then \
16972
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
16973
+ if test -d "$(distdir)/$$file"; then \
16974
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
16976
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
16977
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
16978
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
16979
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
16981
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
16982
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
16984
- test -f $(distdir)/$$file \
16985
- || cp -p $$d/$$file $(distdir)/$$file \
16986
+ test -f "$(distdir)/$$file" \
16987
+ || cp -p $$d/$$file "$(distdir)/$$file" \
16991
@@ -284,6 +310,7 @@
16994
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
16995
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
16997
maintainer-clean-generic:
16998
@echo "This command is intended for maintainers to use"
16999
@@ -303,6 +330,8 @@
17008
@@ -311,18 +340,28 @@
17010
install-dvi: install-dvi-am
17016
install-html: install-html-am
17020
install-info: install-info-am
17026
install-pdf: install-pdf-am
17030
install-ps: install-ps-am
17036
maintainer-clean: maintainer-clean-am
17037
@@ -356,6 +395,7 @@
17038
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
17039
uninstall-am uninstall-iconsDATA
17042
# Tell versions [3.59,3.63) of GNU make to not export all variables.
17043
# Otherwise a system limit (for SysV at least) may be exceeded.
17045
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/48x48/Makefile.in gnome-icon-theme-2.27.90.new/48x48/Makefile.in
17046
--- gnome-icon-theme-2.27.90/48x48/Makefile.in 2009-08-13 03:45:48.000000000 +0200
17047
+++ gnome-icon-theme-2.27.90.new/48x48/Makefile.in 2009-08-27 12:38:30.000000000 +0200
17049
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
17050
+# Makefile.in generated by automake 1.11 from Makefile.am.
17051
# @configure_input@
17053
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
17054
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
17055
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
17057
# This Makefile.in is free software; the Free Software Foundation
17058
# gives unlimited permission to copy and/or distribute it,
17059
# with or without modifications, as long as this notice is preserved.
17063
pkgdatadir = $(datadir)/@PACKAGE@
17064
-pkglibdir = $(libdir)/@PACKAGE@
17065
pkgincludedir = $(includedir)/@PACKAGE@
17066
+pkglibdir = $(libdir)/@PACKAGE@
17067
+pkglibexecdir = $(libexecdir)/@PACKAGE@
17068
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
17069
install_sh_DATA = $(install_sh) -c -m 644
17070
install_sh_PROGRAM = $(install_sh) -c
17073
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
17074
CONFIG_CLEAN_FILES =
17075
+CONFIG_CLEAN_VPATH_FILES =
17078
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
17079
@@ -48,10 +51,38 @@
17080
ps-recursive uninstall-recursive
17081
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
17082
distclean-recursive maintainer-clean-recursive
17083
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
17084
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
17088
DIST_SUBDIRS = $(SUBDIRS)
17089
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
17090
+am__relativize = \
17092
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
17093
+ sed_rest='s,^[^/]*/*,,'; \
17094
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
17095
+ sed_butlast='s,/*[^/]*$$,,'; \
17096
+ while test -n "$$dir1"; do \
17097
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
17098
+ if test "$$first" != "."; then \
17099
+ if test "$$first" = ".."; then \
17100
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
17101
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
17103
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
17104
+ if test "$$first2" = "$$first"; then \
17105
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
17107
+ dir2="../$$dir2"; \
17109
+ dir0="$$dir0"/"$$first"; \
17112
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
17115
ACLOCAL = @ACLOCAL@
17116
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
17117
ALL_LINGUAS = @ALL_LINGUAS@
17118
@@ -108,6 +139,7 @@
17119
PACKAGE_NAME = @PACKAGE_NAME@
17120
PACKAGE_STRING = @PACKAGE_STRING@
17121
PACKAGE_TARNAME = @PACKAGE_TARNAME@
17122
+PACKAGE_URL = @PACKAGE_URL@
17123
PACKAGE_VERSION = @PACKAGE_VERSION@
17124
PATH_SEPARATOR = @PATH_SEPARATOR@
17125
PKG_CONFIG = @PKG_CONFIG@
17126
@@ -187,9 +219,9 @@
17130
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 48x48/Makefile'; \
17131
- cd $(top_srcdir) && \
17132
- $(AUTOMAKE) --gnu 48x48/Makefile
17133
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 48x48/Makefile'; \
17134
+ $(am__cd) $(top_srcdir) && \
17135
+ $(AUTOMAKE) --gnu 48x48/Makefile
17136
.PRECIOUS: Makefile
17137
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
17139
@@ -207,6 +239,7 @@
17140
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
17141
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
17142
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
17143
+$(am__aclocal_m4_deps):
17145
# This directory's subdirectories are mostly independent; you can cd
17146
# into them and run `make' without going through this Makefile.
17147
@@ -232,7 +265,7 @@
17149
local_target="$$target"; \
17151
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
17152
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
17153
|| eval $$failcom; \
17155
if test "$$dot_seen" = "no"; then \
17156
@@ -266,16 +299,16 @@
17158
local_target="$$target"; \
17160
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
17161
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
17162
|| eval $$failcom; \
17163
done && test -z "$$fail"
17165
list='$(SUBDIRS)'; for subdir in $$list; do \
17166
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
17167
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
17170
list='$(SUBDIRS)'; for subdir in $$list; do \
17171
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
17172
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
17175
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
17176
@@ -290,7 +323,7 @@
17178
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
17179
$(TAGS_FILES) $(LISP)
17183
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
17184
include_option=--etags-include; \
17185
@@ -302,7 +335,7 @@
17186
list='$(SUBDIRS)'; for subdir in $$list; do \
17187
if test "$$subdir" = .; then :; else \
17188
test ! -f $$subdir/TAGS || \
17189
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
17190
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
17193
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
17194
@@ -311,29 +344,34 @@
17196
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
17197
END { if (nonempty) { for (i in files) print i; }; }'`; \
17198
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
17200
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
17201
test -n "$$unique" || unique=$$empty_fix; \
17202
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
17203
- $$tags $$unique; \
17204
+ if test $$# -gt 0; then \
17205
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
17206
+ "$$@" $$unique; \
17208
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
17213
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
17214
$(TAGS_FILES) $(LISP)
17216
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
17217
unique=`for i in $$list; do \
17218
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
17220
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
17221
END { if (nonempty) { for (i in files) print i; }; }'`; \
17222
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
17223
+ test -z "$(CTAGS_ARGS)$$unique" \
17224
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
17229
here=`$(am__cd) $(top_builddir) && pwd` \
17230
- && cd $(top_srcdir) \
17231
- && gtags -i $(GTAGS_ARGS) $$here
17232
+ && $(am__cd) $(top_srcdir) \
17233
+ && gtags -i $(GTAGS_ARGS) "$$here"
17236
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
17237
@@ -354,29 +392,44 @@
17238
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
17239
if test -d $$d/$$file; then \
17240
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
17241
+ if test -d "$(distdir)/$$file"; then \
17242
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
17244
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
17245
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
17246
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
17247
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
17249
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
17250
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
17252
- test -f $(distdir)/$$file \
17253
- || cp -p $$d/$$file $(distdir)/$$file \
17254
+ test -f "$(distdir)/$$file" \
17255
+ || cp -p $$d/$$file "$(distdir)/$$file" \
17259
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
17260
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
17261
if test "$$subdir" = .; then :; else \
17262
test -d "$(distdir)/$$subdir" \
17263
|| $(MKDIR_P) "$(distdir)/$$subdir" \
17265
- distdir=`$(am__cd) $(distdir) && pwd`; \
17266
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
17267
- (cd $$subdir && \
17270
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
17271
+ if test "$$subdir" = .; then :; else \
17272
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
17273
+ $(am__relativize); \
17274
+ new_distdir=$$reldir; \
17275
+ dir1=$$subdir; dir2="$(top_distdir)"; \
17276
+ $(am__relativize); \
17277
+ new_top_distdir=$$reldir; \
17278
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
17279
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
17280
+ ($(am__cd) $$subdir && \
17281
$(MAKE) $(AM_MAKEFLAGS) \
17282
- top_distdir="$$top_distdir" \
17283
- distdir="$$distdir/$$subdir" \
17284
+ top_distdir="$$new_top_distdir" \
17285
+ distdir="$$new_distdir" \
17286
am__remove_distdir=: \
17287
am__skip_length_check=: \
17288
+ am__skip_mode_fix=: \
17292
@@ -406,6 +459,7 @@
17295
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
17296
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
17298
maintainer-clean-generic:
17299
@echo "This command is intended for maintainers to use"
17300
@@ -425,6 +479,8 @@
17302
html: html-recursive
17306
info: info-recursive
17309
@@ -433,18 +489,28 @@
17311
install-dvi: install-dvi-recursive
17317
install-html: install-html-recursive
17321
install-info: install-info-recursive
17327
install-pdf: install-pdf-recursive
17331
install-ps: install-ps-recursive
17337
maintainer-clean: maintainer-clean-recursive
17338
@@ -465,8 +531,8 @@
17342
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
17344
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
17345
+ install-am install-strip tags-recursive
17347
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
17348
all all-am check check-am clean clean-generic ctags \
17349
@@ -481,6 +547,7 @@
17350
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
17351
tags-recursive uninstall uninstall-am
17354
# Tell versions [3.59,3.63) of GNU make to not export all variables.
17355
# Otherwise a system limit (for SysV at least) may be exceeded.
17357
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/48x48/stock/code/Makefile.in gnome-icon-theme-2.27.90.new/48x48/stock/code/Makefile.in
17358
--- gnome-icon-theme-2.27.90/48x48/stock/code/Makefile.in 2009-08-13 03:45:50.000000000 +0200
17359
+++ gnome-icon-theme-2.27.90.new/48x48/stock/code/Makefile.in 2009-08-27 12:38:31.000000000 +0200
17361
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
17362
+# Makefile.in generated by automake 1.11 from Makefile.am.
17363
# @configure_input@
17365
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
17366
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
17367
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
17369
# This Makefile.in is free software; the Free Software Foundation
17370
# gives unlimited permission to copy and/or distribute it,
17371
# with or without modifications, as long as this notice is preserved.
17375
pkgdatadir = $(datadir)/@PACKAGE@
17376
-pkglibdir = $(libdir)/@PACKAGE@
17377
pkgincludedir = $(includedir)/@PACKAGE@
17378
+pkglibdir = $(libdir)/@PACKAGE@
17379
+pkglibexecdir = $(libexecdir)/@PACKAGE@
17380
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
17381
install_sh_DATA = $(install_sh) -c -m 644
17382
install_sh_PROGRAM = $(install_sh) -c
17385
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
17386
CONFIG_CLEAN_FILES =
17387
+CONFIG_CLEAN_VPATH_FILES =
17390
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
17392
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
17395
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
17396
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
17397
+am__install_max = 40
17398
+am__nobase_strip_setup = \
17399
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
17400
+am__nobase_strip = \
17401
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
17402
+am__nobase_list = $(am__nobase_strip_setup); \
17403
+ for p in $$list; do echo "$$p $$p"; done | \
17404
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
17405
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
17406
+ if (++n[$$2] == $(am__install_max)) \
17407
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
17408
+ END { for (dir in files) print dir, files[dir] }'
17410
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
17411
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
17412
am__installdirs = "$(DESTDIR)$(icondir)"
17413
-iconDATA_INSTALL = $(INSTALL_DATA)
17414
DATA = $(icon_DATA)
17415
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
17416
ACLOCAL = @ACLOCAL@
17417
@@ -106,6 +123,7 @@
17418
PACKAGE_NAME = @PACKAGE_NAME@
17419
PACKAGE_STRING = @PACKAGE_STRING@
17420
PACKAGE_TARNAME = @PACKAGE_TARNAME@
17421
+PACKAGE_URL = @PACKAGE_URL@
17422
PACKAGE_VERSION = @PACKAGE_VERSION@
17423
PATH_SEPARATOR = @PATH_SEPARATOR@
17424
PKG_CONFIG = @PKG_CONFIG@
17425
@@ -184,9 +202,9 @@
17429
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 48x48/stock/code/Makefile'; \
17430
- cd $(top_srcdir) && \
17431
- $(AUTOMAKE) --gnu 48x48/stock/code/Makefile
17432
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 48x48/stock/code/Makefile'; \
17433
+ $(am__cd) $(top_srcdir) && \
17434
+ $(AUTOMAKE) --gnu 48x48/stock/code/Makefile
17435
.PRECIOUS: Makefile
17436
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
17438
@@ -204,23 +222,27 @@
17439
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
17440
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
17441
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
17442
+$(am__aclocal_m4_deps):
17443
install-iconDATA: $(icon_DATA)
17445
test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
17446
- @list='$(icon_DATA)'; for p in $$list; do \
17447
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
17448
+ for p in $$list; do \
17449
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
17450
- f=$(am__strip_dir) \
17451
- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
17452
- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
17454
+ done | $(am__base_list) | \
17455
+ while read files; do \
17456
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
17457
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
17460
uninstall-iconDATA:
17461
@$(NORMAL_UNINSTALL)
17462
- @list='$(icon_DATA)'; for p in $$list; do \
17463
- f=$(am__strip_dir) \
17464
- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
17465
- rm -f "$(DESTDIR)$(icondir)/$$f"; \
17467
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
17468
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
17469
+ test -n "$$files" || exit 0; \
17470
+ echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
17471
+ cd "$(DESTDIR)$(icondir)" && rm -f $$files
17475
@@ -244,13 +266,17 @@
17476
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
17477
if test -d $$d/$$file; then \
17478
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
17479
+ if test -d "$(distdir)/$$file"; then \
17480
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
17482
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
17483
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
17484
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
17485
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
17487
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
17488
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
17490
- test -f $(distdir)/$$file \
17491
- || cp -p $$d/$$file $(distdir)/$$file \
17492
+ test -f "$(distdir)/$$file" \
17493
+ || cp -p $$d/$$file "$(distdir)/$$file" \
17497
@@ -281,6 +307,7 @@
17500
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
17501
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
17503
maintainer-clean-generic:
17504
@echo "This command is intended for maintainers to use"
17505
@@ -299,6 +326,8 @@
17514
@@ -307,18 +336,28 @@
17516
install-dvi: install-dvi-am
17522
install-html: install-html-am
17526
install-info: install-info-am
17532
install-pdf: install-pdf-am
17536
install-ps: install-ps-am
17542
maintainer-clean: maintainer-clean-am
17543
@@ -352,6 +391,7 @@
17544
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
17545
uninstall-am uninstall-iconDATA
17548
# Tell versions [3.59,3.63) of GNU make to not export all variables.
17549
# Otherwise a system limit (for SysV at least) may be exceeded.
17551
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/48x48/stock/data/Makefile.in gnome-icon-theme-2.27.90.new/48x48/stock/data/Makefile.in
17552
--- gnome-icon-theme-2.27.90/48x48/stock/data/Makefile.in 2009-08-13 03:45:50.000000000 +0200
17553
+++ gnome-icon-theme-2.27.90.new/48x48/stock/data/Makefile.in 2009-08-27 12:38:31.000000000 +0200
17555
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
17556
+# Makefile.in generated by automake 1.11 from Makefile.am.
17557
# @configure_input@
17559
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
17560
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
17561
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
17563
# This Makefile.in is free software; the Free Software Foundation
17564
# gives unlimited permission to copy and/or distribute it,
17565
# with or without modifications, as long as this notice is preserved.
17569
pkgdatadir = $(datadir)/@PACKAGE@
17570
-pkglibdir = $(libdir)/@PACKAGE@
17571
pkgincludedir = $(includedir)/@PACKAGE@
17572
+pkglibdir = $(libdir)/@PACKAGE@
17573
+pkglibexecdir = $(libexecdir)/@PACKAGE@
17574
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
17575
install_sh_DATA = $(install_sh) -c -m 644
17576
install_sh_PROGRAM = $(install_sh) -c
17579
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
17580
CONFIG_CLEAN_FILES =
17581
+CONFIG_CLEAN_VPATH_FILES =
17584
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
17586
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
17589
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
17590
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
17591
+am__install_max = 40
17592
+am__nobase_strip_setup = \
17593
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
17594
+am__nobase_strip = \
17595
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
17596
+am__nobase_list = $(am__nobase_strip_setup); \
17597
+ for p in $$list; do echo "$$p $$p"; done | \
17598
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
17599
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
17600
+ if (++n[$$2] == $(am__install_max)) \
17601
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
17602
+ END { for (dir in files) print dir, files[dir] }'
17604
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
17605
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
17606
am__installdirs = "$(DESTDIR)$(icondir)"
17607
-iconDATA_INSTALL = $(INSTALL_DATA)
17608
DATA = $(icon_DATA)
17609
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
17610
ACLOCAL = @ACLOCAL@
17611
@@ -106,6 +123,7 @@
17612
PACKAGE_NAME = @PACKAGE_NAME@
17613
PACKAGE_STRING = @PACKAGE_STRING@
17614
PACKAGE_TARNAME = @PACKAGE_TARNAME@
17615
+PACKAGE_URL = @PACKAGE_URL@
17616
PACKAGE_VERSION = @PACKAGE_VERSION@
17617
PATH_SEPARATOR = @PATH_SEPARATOR@
17618
PKG_CONFIG = @PKG_CONFIG@
17619
@@ -190,9 +208,9 @@
17623
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 48x48/stock/data/Makefile'; \
17624
- cd $(top_srcdir) && \
17625
- $(AUTOMAKE) --gnu 48x48/stock/data/Makefile
17626
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 48x48/stock/data/Makefile'; \
17627
+ $(am__cd) $(top_srcdir) && \
17628
+ $(AUTOMAKE) --gnu 48x48/stock/data/Makefile
17629
.PRECIOUS: Makefile
17630
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
17632
@@ -210,23 +228,27 @@
17633
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
17634
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
17635
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
17636
+$(am__aclocal_m4_deps):
17637
install-iconDATA: $(icon_DATA)
17639
test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
17640
- @list='$(icon_DATA)'; for p in $$list; do \
17641
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
17642
+ for p in $$list; do \
17643
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
17644
- f=$(am__strip_dir) \
17645
- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
17646
- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
17648
+ done | $(am__base_list) | \
17649
+ while read files; do \
17650
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
17651
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
17654
uninstall-iconDATA:
17655
@$(NORMAL_UNINSTALL)
17656
- @list='$(icon_DATA)'; for p in $$list; do \
17657
- f=$(am__strip_dir) \
17658
- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
17659
- rm -f "$(DESTDIR)$(icondir)/$$f"; \
17661
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
17662
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
17663
+ test -n "$$files" || exit 0; \
17664
+ echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
17665
+ cd "$(DESTDIR)$(icondir)" && rm -f $$files
17669
@@ -250,13 +272,17 @@
17670
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
17671
if test -d $$d/$$file; then \
17672
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
17673
+ if test -d "$(distdir)/$$file"; then \
17674
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
17676
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
17677
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
17678
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
17679
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
17681
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
17682
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
17684
- test -f $(distdir)/$$file \
17685
- || cp -p $$d/$$file $(distdir)/$$file \
17686
+ test -f "$(distdir)/$$file" \
17687
+ || cp -p $$d/$$file "$(distdir)/$$file" \
17691
@@ -287,6 +313,7 @@
17694
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
17695
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
17697
maintainer-clean-generic:
17698
@echo "This command is intended for maintainers to use"
17699
@@ -305,6 +332,8 @@
17708
@@ -313,18 +342,28 @@
17710
install-dvi: install-dvi-am
17716
install-html: install-html-am
17720
install-info: install-info-am
17726
install-pdf: install-pdf-am
17730
install-ps: install-ps-am
17736
maintainer-clean: maintainer-clean-am
17737
@@ -358,6 +397,7 @@
17738
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
17739
uninstall-am uninstall-iconDATA
17742
# Tell versions [3.59,3.63) of GNU make to not export all variables.
17743
# Otherwise a system limit (for SysV at least) may be exceeded.
17745
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/48x48/stock/document/Makefile.in gnome-icon-theme-2.27.90.new/48x48/stock/document/Makefile.in
17746
--- gnome-icon-theme-2.27.90/48x48/stock/document/Makefile.in 2009-08-13 03:45:50.000000000 +0200
17747
+++ gnome-icon-theme-2.27.90.new/48x48/stock/document/Makefile.in 2009-08-27 12:38:31.000000000 +0200
17749
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
17750
+# Makefile.in generated by automake 1.11 from Makefile.am.
17751
# @configure_input@
17753
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
17754
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
17755
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
17757
# This Makefile.in is free software; the Free Software Foundation
17758
# gives unlimited permission to copy and/or distribute it,
17759
# with or without modifications, as long as this notice is preserved.
17763
pkgdatadir = $(datadir)/@PACKAGE@
17764
-pkglibdir = $(libdir)/@PACKAGE@
17765
pkgincludedir = $(includedir)/@PACKAGE@
17766
+pkglibdir = $(libdir)/@PACKAGE@
17767
+pkglibexecdir = $(libexecdir)/@PACKAGE@
17768
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
17769
install_sh_DATA = $(install_sh) -c -m 644
17770
install_sh_PROGRAM = $(install_sh) -c
17773
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
17774
CONFIG_CLEAN_FILES =
17775
+CONFIG_CLEAN_VPATH_FILES =
17778
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
17780
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
17783
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
17784
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
17785
+am__install_max = 40
17786
+am__nobase_strip_setup = \
17787
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
17788
+am__nobase_strip = \
17789
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
17790
+am__nobase_list = $(am__nobase_strip_setup); \
17791
+ for p in $$list; do echo "$$p $$p"; done | \
17792
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
17793
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
17794
+ if (++n[$$2] == $(am__install_max)) \
17795
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
17796
+ END { for (dir in files) print dir, files[dir] }'
17798
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
17799
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
17800
am__installdirs = "$(DESTDIR)$(icondir)"
17801
-iconDATA_INSTALL = $(INSTALL_DATA)
17802
DATA = $(icon_DATA)
17803
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
17804
ACLOCAL = @ACLOCAL@
17805
@@ -106,6 +123,7 @@
17806
PACKAGE_NAME = @PACKAGE_NAME@
17807
PACKAGE_STRING = @PACKAGE_STRING@
17808
PACKAGE_TARNAME = @PACKAGE_TARNAME@
17809
+PACKAGE_URL = @PACKAGE_URL@
17810
PACKAGE_VERSION = @PACKAGE_VERSION@
17811
PATH_SEPARATOR = @PATH_SEPARATOR@
17812
PKG_CONFIG = @PKG_CONFIG@
17813
@@ -194,9 +212,9 @@
17817
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 48x48/stock/document/Makefile'; \
17818
- cd $(top_srcdir) && \
17819
- $(AUTOMAKE) --gnu 48x48/stock/document/Makefile
17820
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 48x48/stock/document/Makefile'; \
17821
+ $(am__cd) $(top_srcdir) && \
17822
+ $(AUTOMAKE) --gnu 48x48/stock/document/Makefile
17823
.PRECIOUS: Makefile
17824
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
17826
@@ -214,23 +232,27 @@
17827
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
17828
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
17829
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
17830
+$(am__aclocal_m4_deps):
17831
install-iconDATA: $(icon_DATA)
17833
test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
17834
- @list='$(icon_DATA)'; for p in $$list; do \
17835
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
17836
+ for p in $$list; do \
17837
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
17838
- f=$(am__strip_dir) \
17839
- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
17840
- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
17842
+ done | $(am__base_list) | \
17843
+ while read files; do \
17844
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
17845
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
17848
uninstall-iconDATA:
17849
@$(NORMAL_UNINSTALL)
17850
- @list='$(icon_DATA)'; for p in $$list; do \
17851
- f=$(am__strip_dir) \
17852
- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
17853
- rm -f "$(DESTDIR)$(icondir)/$$f"; \
17855
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
17856
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
17857
+ test -n "$$files" || exit 0; \
17858
+ echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
17859
+ cd "$(DESTDIR)$(icondir)" && rm -f $$files
17863
@@ -254,13 +276,17 @@
17864
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
17865
if test -d $$d/$$file; then \
17866
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
17867
+ if test -d "$(distdir)/$$file"; then \
17868
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
17870
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
17871
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
17872
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
17873
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
17875
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
17876
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
17878
- test -f $(distdir)/$$file \
17879
- || cp -p $$d/$$file $(distdir)/$$file \
17880
+ test -f "$(distdir)/$$file" \
17881
+ || cp -p $$d/$$file "$(distdir)/$$file" \
17885
@@ -291,6 +317,7 @@
17888
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
17889
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
17891
maintainer-clean-generic:
17892
@echo "This command is intended for maintainers to use"
17893
@@ -309,6 +336,8 @@
17902
@@ -317,18 +346,28 @@
17904
install-dvi: install-dvi-am
17910
install-html: install-html-am
17914
install-info: install-info-am
17920
install-pdf: install-pdf-am
17924
install-ps: install-ps-am
17930
maintainer-clean: maintainer-clean-am
17931
@@ -362,6 +401,7 @@
17932
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
17933
uninstall-am uninstall-iconDATA
17936
# Tell versions [3.59,3.63) of GNU make to not export all variables.
17937
# Otherwise a system limit (for SysV at least) may be exceeded.
17939
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/48x48/stock/generic/Makefile.in gnome-icon-theme-2.27.90.new/48x48/stock/generic/Makefile.in
17940
--- gnome-icon-theme-2.27.90/48x48/stock/generic/Makefile.in 2009-08-13 03:45:50.000000000 +0200
17941
+++ gnome-icon-theme-2.27.90.new/48x48/stock/generic/Makefile.in 2009-08-27 12:38:31.000000000 +0200
17943
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
17944
+# Makefile.in generated by automake 1.11 from Makefile.am.
17945
# @configure_input@
17947
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
17948
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
17949
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
17951
# This Makefile.in is free software; the Free Software Foundation
17952
# gives unlimited permission to copy and/or distribute it,
17953
# with or without modifications, as long as this notice is preserved.
17957
pkgdatadir = $(datadir)/@PACKAGE@
17958
-pkglibdir = $(libdir)/@PACKAGE@
17959
pkgincludedir = $(includedir)/@PACKAGE@
17960
+pkglibdir = $(libdir)/@PACKAGE@
17961
+pkglibexecdir = $(libexecdir)/@PACKAGE@
17962
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
17963
install_sh_DATA = $(install_sh) -c -m 644
17964
install_sh_PROGRAM = $(install_sh) -c
17967
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
17968
CONFIG_CLEAN_FILES =
17969
+CONFIG_CLEAN_VPATH_FILES =
17972
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
17974
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
17977
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
17978
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
17979
+am__install_max = 40
17980
+am__nobase_strip_setup = \
17981
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
17982
+am__nobase_strip = \
17983
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
17984
+am__nobase_list = $(am__nobase_strip_setup); \
17985
+ for p in $$list; do echo "$$p $$p"; done | \
17986
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
17987
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
17988
+ if (++n[$$2] == $(am__install_max)) \
17989
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
17990
+ END { for (dir in files) print dir, files[dir] }'
17992
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
17993
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
17994
am__installdirs = "$(DESTDIR)$(icondir)"
17995
-iconDATA_INSTALL = $(INSTALL_DATA)
17996
DATA = $(icon_DATA)
17997
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
17998
ACLOCAL = @ACLOCAL@
17999
@@ -106,6 +123,7 @@
18000
PACKAGE_NAME = @PACKAGE_NAME@
18001
PACKAGE_STRING = @PACKAGE_STRING@
18002
PACKAGE_TARNAME = @PACKAGE_TARNAME@
18003
+PACKAGE_URL = @PACKAGE_URL@
18004
PACKAGE_VERSION = @PACKAGE_VERSION@
18005
PATH_SEPARATOR = @PATH_SEPARATOR@
18006
PKG_CONFIG = @PKG_CONFIG@
18007
@@ -205,9 +223,9 @@
18011
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 48x48/stock/generic/Makefile'; \
18012
- cd $(top_srcdir) && \
18013
- $(AUTOMAKE) --gnu 48x48/stock/generic/Makefile
18014
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 48x48/stock/generic/Makefile'; \
18015
+ $(am__cd) $(top_srcdir) && \
18016
+ $(AUTOMAKE) --gnu 48x48/stock/generic/Makefile
18017
.PRECIOUS: Makefile
18018
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
18020
@@ -225,23 +243,27 @@
18021
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
18022
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
18023
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
18024
+$(am__aclocal_m4_deps):
18025
install-iconDATA: $(icon_DATA)
18027
test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
18028
- @list='$(icon_DATA)'; for p in $$list; do \
18029
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
18030
+ for p in $$list; do \
18031
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
18032
- f=$(am__strip_dir) \
18033
- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
18034
- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
18036
+ done | $(am__base_list) | \
18037
+ while read files; do \
18038
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
18039
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
18042
uninstall-iconDATA:
18043
@$(NORMAL_UNINSTALL)
18044
- @list='$(icon_DATA)'; for p in $$list; do \
18045
- f=$(am__strip_dir) \
18046
- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
18047
- rm -f "$(DESTDIR)$(icondir)/$$f"; \
18049
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
18050
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
18051
+ test -n "$$files" || exit 0; \
18052
+ echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
18053
+ cd "$(DESTDIR)$(icondir)" && rm -f $$files
18057
@@ -265,13 +287,17 @@
18058
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
18059
if test -d $$d/$$file; then \
18060
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
18061
+ if test -d "$(distdir)/$$file"; then \
18062
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
18064
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
18065
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
18066
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
18067
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
18069
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
18070
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
18072
- test -f $(distdir)/$$file \
18073
- || cp -p $$d/$$file $(distdir)/$$file \
18074
+ test -f "$(distdir)/$$file" \
18075
+ || cp -p $$d/$$file "$(distdir)/$$file" \
18079
@@ -302,6 +328,7 @@
18082
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
18083
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
18085
maintainer-clean-generic:
18086
@echo "This command is intended for maintainers to use"
18087
@@ -320,6 +347,8 @@
18096
@@ -328,18 +357,28 @@
18098
install-dvi: install-dvi-am
18104
install-html: install-html-am
18108
install-info: install-info-am
18114
install-pdf: install-pdf-am
18118
install-ps: install-ps-am
18124
maintainer-clean: maintainer-clean-am
18125
@@ -373,6 +412,7 @@
18126
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
18127
uninstall-am uninstall-iconDATA
18130
# Tell versions [3.59,3.63) of GNU make to not export all variables.
18131
# Otherwise a system limit (for SysV at least) may be exceeded.
18133
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/48x48/stock/io/Makefile.in gnome-icon-theme-2.27.90.new/48x48/stock/io/Makefile.in
18134
--- gnome-icon-theme-2.27.90/48x48/stock/io/Makefile.in 2009-08-13 03:45:50.000000000 +0200
18135
+++ gnome-icon-theme-2.27.90.new/48x48/stock/io/Makefile.in 2009-08-27 12:38:31.000000000 +0200
18137
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
18138
+# Makefile.in generated by automake 1.11 from Makefile.am.
18139
# @configure_input@
18141
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
18142
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
18143
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
18145
# This Makefile.in is free software; the Free Software Foundation
18146
# gives unlimited permission to copy and/or distribute it,
18147
# with or without modifications, as long as this notice is preserved.
18151
pkgdatadir = $(datadir)/@PACKAGE@
18152
-pkglibdir = $(libdir)/@PACKAGE@
18153
pkgincludedir = $(includedir)/@PACKAGE@
18154
+pkglibdir = $(libdir)/@PACKAGE@
18155
+pkglibexecdir = $(libexecdir)/@PACKAGE@
18156
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
18157
install_sh_DATA = $(install_sh) -c -m 644
18158
install_sh_PROGRAM = $(install_sh) -c
18161
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
18162
CONFIG_CLEAN_FILES =
18163
+CONFIG_CLEAN_VPATH_FILES =
18166
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
18168
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
18171
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
18172
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
18173
+am__install_max = 40
18174
+am__nobase_strip_setup = \
18175
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
18176
+am__nobase_strip = \
18177
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
18178
+am__nobase_list = $(am__nobase_strip_setup); \
18179
+ for p in $$list; do echo "$$p $$p"; done | \
18180
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
18181
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
18182
+ if (++n[$$2] == $(am__install_max)) \
18183
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
18184
+ END { for (dir in files) print dir, files[dir] }'
18186
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
18187
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
18188
am__installdirs = "$(DESTDIR)$(icondir)"
18189
-iconDATA_INSTALL = $(INSTALL_DATA)
18190
DATA = $(icon_DATA)
18191
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
18192
ACLOCAL = @ACLOCAL@
18193
@@ -106,6 +123,7 @@
18194
PACKAGE_NAME = @PACKAGE_NAME@
18195
PACKAGE_STRING = @PACKAGE_STRING@
18196
PACKAGE_TARNAME = @PACKAGE_TARNAME@
18197
+PACKAGE_URL = @PACKAGE_URL@
18198
PACKAGE_VERSION = @PACKAGE_VERSION@
18199
PATH_SEPARATOR = @PATH_SEPARATOR@
18200
PKG_CONFIG = @PKG_CONFIG@
18201
@@ -194,9 +212,9 @@
18205
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 48x48/stock/io/Makefile'; \
18206
- cd $(top_srcdir) && \
18207
- $(AUTOMAKE) --gnu 48x48/stock/io/Makefile
18208
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 48x48/stock/io/Makefile'; \
18209
+ $(am__cd) $(top_srcdir) && \
18210
+ $(AUTOMAKE) --gnu 48x48/stock/io/Makefile
18211
.PRECIOUS: Makefile
18212
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
18214
@@ -214,23 +232,27 @@
18215
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
18216
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
18217
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
18218
+$(am__aclocal_m4_deps):
18219
install-iconDATA: $(icon_DATA)
18221
test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
18222
- @list='$(icon_DATA)'; for p in $$list; do \
18223
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
18224
+ for p in $$list; do \
18225
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
18226
- f=$(am__strip_dir) \
18227
- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
18228
- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
18230
+ done | $(am__base_list) | \
18231
+ while read files; do \
18232
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
18233
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
18236
uninstall-iconDATA:
18237
@$(NORMAL_UNINSTALL)
18238
- @list='$(icon_DATA)'; for p in $$list; do \
18239
- f=$(am__strip_dir) \
18240
- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
18241
- rm -f "$(DESTDIR)$(icondir)/$$f"; \
18243
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
18244
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
18245
+ test -n "$$files" || exit 0; \
18246
+ echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
18247
+ cd "$(DESTDIR)$(icondir)" && rm -f $$files
18251
@@ -254,13 +276,17 @@
18252
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
18253
if test -d $$d/$$file; then \
18254
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
18255
+ if test -d "$(distdir)/$$file"; then \
18256
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
18258
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
18259
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
18260
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
18261
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
18263
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
18264
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
18266
- test -f $(distdir)/$$file \
18267
- || cp -p $$d/$$file $(distdir)/$$file \
18268
+ test -f "$(distdir)/$$file" \
18269
+ || cp -p $$d/$$file "$(distdir)/$$file" \
18273
@@ -291,6 +317,7 @@
18276
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
18277
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
18279
maintainer-clean-generic:
18280
@echo "This command is intended for maintainers to use"
18281
@@ -309,6 +336,8 @@
18290
@@ -317,18 +346,28 @@
18292
install-dvi: install-dvi-am
18298
install-html: install-html-am
18302
install-info: install-info-am
18308
install-pdf: install-pdf-am
18312
install-ps: install-ps-am
18318
maintainer-clean: maintainer-clean-am
18319
@@ -362,6 +401,7 @@
18320
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
18321
uninstall-am uninstall-iconDATA
18324
# Tell versions [3.59,3.63) of GNU make to not export all variables.
18325
# Otherwise a system limit (for SysV at least) may be exceeded.
18327
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/48x48/stock/Makefile.in gnome-icon-theme-2.27.90.new/48x48/stock/Makefile.in
18328
--- gnome-icon-theme-2.27.90/48x48/stock/Makefile.in 2009-08-13 03:45:50.000000000 +0200
18329
+++ gnome-icon-theme-2.27.90.new/48x48/stock/Makefile.in 2009-08-27 12:38:31.000000000 +0200
18331
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
18332
+# Makefile.in generated by automake 1.11 from Makefile.am.
18333
# @configure_input@
18335
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
18336
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
18337
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
18339
# This Makefile.in is free software; the Free Software Foundation
18340
# gives unlimited permission to copy and/or distribute it,
18341
# with or without modifications, as long as this notice is preserved.
18345
pkgdatadir = $(datadir)/@PACKAGE@
18346
-pkglibdir = $(libdir)/@PACKAGE@
18347
pkgincludedir = $(includedir)/@PACKAGE@
18348
+pkglibdir = $(libdir)/@PACKAGE@
18349
+pkglibexecdir = $(libexecdir)/@PACKAGE@
18350
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
18351
install_sh_DATA = $(install_sh) -c -m 644
18352
install_sh_PROGRAM = $(install_sh) -c
18355
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
18356
CONFIG_CLEAN_FILES =
18357
+CONFIG_CLEAN_VPATH_FILES =
18360
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
18361
@@ -48,10 +51,38 @@
18362
ps-recursive uninstall-recursive
18363
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
18364
distclean-recursive maintainer-clean-recursive
18365
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
18366
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
18370
DIST_SUBDIRS = $(SUBDIRS)
18371
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
18372
+am__relativize = \
18374
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
18375
+ sed_rest='s,^[^/]*/*,,'; \
18376
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
18377
+ sed_butlast='s,/*[^/]*$$,,'; \
18378
+ while test -n "$$dir1"; do \
18379
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
18380
+ if test "$$first" != "."; then \
18381
+ if test "$$first" = ".."; then \
18382
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
18383
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
18385
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
18386
+ if test "$$first2" = "$$first"; then \
18387
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
18389
+ dir2="../$$dir2"; \
18391
+ dir0="$$dir0"/"$$first"; \
18394
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
18397
ACLOCAL = @ACLOCAL@
18398
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
18399
ALL_LINGUAS = @ALL_LINGUAS@
18400
@@ -108,6 +139,7 @@
18401
PACKAGE_NAME = @PACKAGE_NAME@
18402
PACKAGE_STRING = @PACKAGE_STRING@
18403
PACKAGE_TARNAME = @PACKAGE_TARNAME@
18404
+PACKAGE_URL = @PACKAGE_URL@
18405
PACKAGE_VERSION = @PACKAGE_VERSION@
18406
PATH_SEPARATOR = @PATH_SEPARATOR@
18407
PKG_CONFIG = @PKG_CONFIG@
18408
@@ -177,9 +209,9 @@
18412
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 48x48/stock/Makefile'; \
18413
- cd $(top_srcdir) && \
18414
- $(AUTOMAKE) --gnu 48x48/stock/Makefile
18415
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 48x48/stock/Makefile'; \
18416
+ $(am__cd) $(top_srcdir) && \
18417
+ $(AUTOMAKE) --gnu 48x48/stock/Makefile
18418
.PRECIOUS: Makefile
18419
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
18421
@@ -197,6 +229,7 @@
18422
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
18423
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
18424
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
18425
+$(am__aclocal_m4_deps):
18427
# This directory's subdirectories are mostly independent; you can cd
18428
# into them and run `make' without going through this Makefile.
18429
@@ -222,7 +255,7 @@
18431
local_target="$$target"; \
18433
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
18434
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
18435
|| eval $$failcom; \
18437
if test "$$dot_seen" = "no"; then \
18438
@@ -256,16 +289,16 @@
18440
local_target="$$target"; \
18442
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
18443
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
18444
|| eval $$failcom; \
18445
done && test -z "$$fail"
18447
list='$(SUBDIRS)'; for subdir in $$list; do \
18448
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
18449
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
18452
list='$(SUBDIRS)'; for subdir in $$list; do \
18453
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
18454
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
18457
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
18458
@@ -280,7 +313,7 @@
18460
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
18461
$(TAGS_FILES) $(LISP)
18465
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
18466
include_option=--etags-include; \
18467
@@ -292,7 +325,7 @@
18468
list='$(SUBDIRS)'; for subdir in $$list; do \
18469
if test "$$subdir" = .; then :; else \
18470
test ! -f $$subdir/TAGS || \
18471
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
18472
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
18475
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
18476
@@ -301,29 +334,34 @@
18478
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
18479
END { if (nonempty) { for (i in files) print i; }; }'`; \
18480
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
18482
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
18483
test -n "$$unique" || unique=$$empty_fix; \
18484
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
18485
- $$tags $$unique; \
18486
+ if test $$# -gt 0; then \
18487
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
18488
+ "$$@" $$unique; \
18490
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
18495
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
18496
$(TAGS_FILES) $(LISP)
18498
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
18499
unique=`for i in $$list; do \
18500
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
18502
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
18503
END { if (nonempty) { for (i in files) print i; }; }'`; \
18504
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
18505
+ test -z "$(CTAGS_ARGS)$$unique" \
18506
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
18511
here=`$(am__cd) $(top_builddir) && pwd` \
18512
- && cd $(top_srcdir) \
18513
- && gtags -i $(GTAGS_ARGS) $$here
18514
+ && $(am__cd) $(top_srcdir) \
18515
+ && gtags -i $(GTAGS_ARGS) "$$here"
18518
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
18519
@@ -344,29 +382,44 @@
18520
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
18521
if test -d $$d/$$file; then \
18522
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
18523
+ if test -d "$(distdir)/$$file"; then \
18524
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
18526
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
18527
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
18528
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
18529
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
18531
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
18532
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
18534
- test -f $(distdir)/$$file \
18535
- || cp -p $$d/$$file $(distdir)/$$file \
18536
+ test -f "$(distdir)/$$file" \
18537
+ || cp -p $$d/$$file "$(distdir)/$$file" \
18541
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
18542
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
18543
if test "$$subdir" = .; then :; else \
18544
test -d "$(distdir)/$$subdir" \
18545
|| $(MKDIR_P) "$(distdir)/$$subdir" \
18547
- distdir=`$(am__cd) $(distdir) && pwd`; \
18548
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
18549
- (cd $$subdir && \
18552
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
18553
+ if test "$$subdir" = .; then :; else \
18554
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
18555
+ $(am__relativize); \
18556
+ new_distdir=$$reldir; \
18557
+ dir1=$$subdir; dir2="$(top_distdir)"; \
18558
+ $(am__relativize); \
18559
+ new_top_distdir=$$reldir; \
18560
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
18561
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
18562
+ ($(am__cd) $$subdir && \
18563
$(MAKE) $(AM_MAKEFLAGS) \
18564
- top_distdir="$$top_distdir" \
18565
- distdir="$$distdir/$$subdir" \
18566
+ top_distdir="$$new_top_distdir" \
18567
+ distdir="$$new_distdir" \
18568
am__remove_distdir=: \
18569
am__skip_length_check=: \
18570
+ am__skip_mode_fix=: \
18574
@@ -396,6 +449,7 @@
18577
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
18578
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
18580
maintainer-clean-generic:
18581
@echo "This command is intended for maintainers to use"
18582
@@ -414,6 +468,8 @@
18584
html: html-recursive
18588
info: info-recursive
18591
@@ -422,18 +478,28 @@
18593
install-dvi: install-dvi-recursive
18599
install-html: install-html-recursive
18603
install-info: install-info-recursive
18609
install-pdf: install-pdf-recursive
18613
install-ps: install-ps-recursive
18619
maintainer-clean: maintainer-clean-recursive
18620
@@ -454,8 +520,8 @@
18624
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
18626
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
18627
+ install-am install-strip tags-recursive
18629
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
18630
all all-am check check-am clean clean-generic ctags \
18631
@@ -470,6 +536,7 @@
18632
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
18633
tags-recursive uninstall uninstall-am
18636
# Tell versions [3.59,3.63) of GNU make to not export all variables.
18637
# Otherwise a system limit (for SysV at least) may be exceeded.
18639
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/48x48/stock/net/Makefile.in gnome-icon-theme-2.27.90.new/48x48/stock/net/Makefile.in
18640
--- gnome-icon-theme-2.27.90/48x48/stock/net/Makefile.in 2009-08-13 03:45:51.000000000 +0200
18641
+++ gnome-icon-theme-2.27.90.new/48x48/stock/net/Makefile.in 2009-08-27 12:38:31.000000000 +0200
18643
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
18644
+# Makefile.in generated by automake 1.11 from Makefile.am.
18645
# @configure_input@
18647
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
18648
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
18649
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
18651
# This Makefile.in is free software; the Free Software Foundation
18652
# gives unlimited permission to copy and/or distribute it,
18653
# with or without modifications, as long as this notice is preserved.
18657
pkgdatadir = $(datadir)/@PACKAGE@
18658
-pkglibdir = $(libdir)/@PACKAGE@
18659
pkgincludedir = $(includedir)/@PACKAGE@
18660
+pkglibdir = $(libdir)/@PACKAGE@
18661
+pkglibexecdir = $(libexecdir)/@PACKAGE@
18662
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
18663
install_sh_DATA = $(install_sh) -c -m 644
18664
install_sh_PROGRAM = $(install_sh) -c
18667
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
18668
CONFIG_CLEAN_FILES =
18669
+CONFIG_CLEAN_VPATH_FILES =
18672
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
18674
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
18677
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
18678
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
18679
+am__install_max = 40
18680
+am__nobase_strip_setup = \
18681
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
18682
+am__nobase_strip = \
18683
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
18684
+am__nobase_list = $(am__nobase_strip_setup); \
18685
+ for p in $$list; do echo "$$p $$p"; done | \
18686
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
18687
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
18688
+ if (++n[$$2] == $(am__install_max)) \
18689
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
18690
+ END { for (dir in files) print dir, files[dir] }'
18692
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
18693
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
18694
am__installdirs = "$(DESTDIR)$(icondir)"
18695
-iconDATA_INSTALL = $(INSTALL_DATA)
18696
DATA = $(icon_DATA)
18697
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
18698
ACLOCAL = @ACLOCAL@
18699
@@ -106,6 +123,7 @@
18700
PACKAGE_NAME = @PACKAGE_NAME@
18701
PACKAGE_STRING = @PACKAGE_STRING@
18702
PACKAGE_TARNAME = @PACKAGE_TARNAME@
18703
+PACKAGE_URL = @PACKAGE_URL@
18704
PACKAGE_VERSION = @PACKAGE_VERSION@
18705
PATH_SEPARATOR = @PATH_SEPARATOR@
18706
PKG_CONFIG = @PKG_CONFIG@
18707
@@ -207,9 +225,9 @@
18711
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 48x48/stock/net/Makefile'; \
18712
- cd $(top_srcdir) && \
18713
- $(AUTOMAKE) --gnu 48x48/stock/net/Makefile
18714
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 48x48/stock/net/Makefile'; \
18715
+ $(am__cd) $(top_srcdir) && \
18716
+ $(AUTOMAKE) --gnu 48x48/stock/net/Makefile
18717
.PRECIOUS: Makefile
18718
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
18720
@@ -227,23 +245,27 @@
18721
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
18722
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
18723
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
18724
+$(am__aclocal_m4_deps):
18725
install-iconDATA: $(icon_DATA)
18727
test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
18728
- @list='$(icon_DATA)'; for p in $$list; do \
18729
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
18730
+ for p in $$list; do \
18731
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
18732
- f=$(am__strip_dir) \
18733
- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
18734
- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
18736
+ done | $(am__base_list) | \
18737
+ while read files; do \
18738
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
18739
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
18742
uninstall-iconDATA:
18743
@$(NORMAL_UNINSTALL)
18744
- @list='$(icon_DATA)'; for p in $$list; do \
18745
- f=$(am__strip_dir) \
18746
- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
18747
- rm -f "$(DESTDIR)$(icondir)/$$f"; \
18749
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
18750
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
18751
+ test -n "$$files" || exit 0; \
18752
+ echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
18753
+ cd "$(DESTDIR)$(icondir)" && rm -f $$files
18757
@@ -267,13 +289,17 @@
18758
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
18759
if test -d $$d/$$file; then \
18760
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
18761
+ if test -d "$(distdir)/$$file"; then \
18762
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
18764
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
18765
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
18766
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
18767
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
18769
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
18770
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
18772
- test -f $(distdir)/$$file \
18773
- || cp -p $$d/$$file $(distdir)/$$file \
18774
+ test -f "$(distdir)/$$file" \
18775
+ || cp -p $$d/$$file "$(distdir)/$$file" \
18779
@@ -304,6 +330,7 @@
18782
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
18783
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
18785
maintainer-clean-generic:
18786
@echo "This command is intended for maintainers to use"
18787
@@ -322,6 +349,8 @@
18796
@@ -330,18 +359,28 @@
18798
install-dvi: install-dvi-am
18804
install-html: install-html-am
18808
install-info: install-info-am
18814
install-pdf: install-pdf-am
18818
install-ps: install-ps-am
18824
maintainer-clean: maintainer-clean-am
18825
@@ -375,6 +414,7 @@
18826
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
18827
uninstall-am uninstall-iconDATA
18830
# Tell versions [3.59,3.63) of GNU make to not export all variables.
18831
# Otherwise a system limit (for SysV at least) may be exceeded.
18833
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/8x8/emblems/Makefile.in gnome-icon-theme-2.27.90.new/8x8/emblems/Makefile.in
18834
--- gnome-icon-theme-2.27.90/8x8/emblems/Makefile.in 2009-08-13 03:45:51.000000000 +0200
18835
+++ gnome-icon-theme-2.27.90.new/8x8/emblems/Makefile.in 2009-08-27 12:38:31.000000000 +0200
18837
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
18838
+# Makefile.in generated by automake 1.11 from Makefile.am.
18839
# @configure_input@
18841
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
18842
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
18843
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
18845
# This Makefile.in is free software; the Free Software Foundation
18846
# gives unlimited permission to copy and/or distribute it,
18847
# with or without modifications, as long as this notice is preserved.
18851
pkgdatadir = $(datadir)/@PACKAGE@
18852
-pkglibdir = $(libdir)/@PACKAGE@
18853
pkgincludedir = $(includedir)/@PACKAGE@
18854
+pkglibdir = $(libdir)/@PACKAGE@
18855
+pkglibexecdir = $(libexecdir)/@PACKAGE@
18856
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
18857
install_sh_DATA = $(install_sh) -c -m 644
18858
install_sh_PROGRAM = $(install_sh) -c
18861
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
18862
CONFIG_CLEAN_FILES =
18863
+CONFIG_CLEAN_VPATH_FILES =
18866
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
18868
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
18871
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
18872
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
18873
+am__install_max = 40
18874
+am__nobase_strip_setup = \
18875
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
18876
+am__nobase_strip = \
18877
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
18878
+am__nobase_list = $(am__nobase_strip_setup); \
18879
+ for p in $$list; do echo "$$p $$p"; done | \
18880
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
18881
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
18882
+ if (++n[$$2] == $(am__install_max)) \
18883
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
18884
+ END { for (dir in files) print dir, files[dir] }'
18886
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
18887
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
18888
am__installdirs = "$(DESTDIR)$(iconsdir)"
18889
-iconsDATA_INSTALL = $(INSTALL_DATA)
18890
DATA = $(icons_DATA)
18891
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
18892
ACLOCAL = @ACLOCAL@
18893
@@ -106,6 +123,7 @@
18894
PACKAGE_NAME = @PACKAGE_NAME@
18895
PACKAGE_STRING = @PACKAGE_STRING@
18896
PACKAGE_TARNAME = @PACKAGE_TARNAME@
18897
+PACKAGE_URL = @PACKAGE_URL@
18898
PACKAGE_VERSION = @PACKAGE_VERSION@
18899
PATH_SEPARATOR = @PATH_SEPARATOR@
18900
PKG_CONFIG = @PKG_CONFIG@
18901
@@ -190,9 +208,9 @@
18905
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 8x8/emblems/Makefile'; \
18906
- cd $(top_srcdir) && \
18907
- $(AUTOMAKE) --gnu 8x8/emblems/Makefile
18908
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 8x8/emblems/Makefile'; \
18909
+ $(am__cd) $(top_srcdir) && \
18910
+ $(AUTOMAKE) --gnu 8x8/emblems/Makefile
18911
.PRECIOUS: Makefile
18912
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
18914
@@ -210,23 +228,27 @@
18915
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
18916
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
18917
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
18918
+$(am__aclocal_m4_deps):
18919
install-iconsDATA: $(icons_DATA)
18921
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
18922
- @list='$(icons_DATA)'; for p in $$list; do \
18923
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
18924
+ for p in $$list; do \
18925
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
18926
- f=$(am__strip_dir) \
18927
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
18928
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
18930
+ done | $(am__base_list) | \
18931
+ while read files; do \
18932
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
18933
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
18936
uninstall-iconsDATA:
18937
@$(NORMAL_UNINSTALL)
18938
- @list='$(icons_DATA)'; for p in $$list; do \
18939
- f=$(am__strip_dir) \
18940
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
18941
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
18943
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
18944
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
18945
+ test -n "$$files" || exit 0; \
18946
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
18947
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
18951
@@ -250,13 +272,17 @@
18952
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
18953
if test -d $$d/$$file; then \
18954
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
18955
+ if test -d "$(distdir)/$$file"; then \
18956
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
18958
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
18959
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
18960
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
18961
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
18963
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
18964
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
18966
- test -f $(distdir)/$$file \
18967
- || cp -p $$d/$$file $(distdir)/$$file \
18968
+ test -f "$(distdir)/$$file" \
18969
+ || cp -p $$d/$$file "$(distdir)/$$file" \
18973
@@ -287,6 +313,7 @@
18976
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
18977
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
18979
maintainer-clean-generic:
18980
@echo "This command is intended for maintainers to use"
18981
@@ -306,6 +333,8 @@
18990
@@ -314,18 +343,28 @@
18992
install-dvi: install-dvi-am
18998
install-html: install-html-am
19002
install-info: install-info-am
19008
install-pdf: install-pdf-am
19012
install-ps: install-ps-am
19018
maintainer-clean: maintainer-clean-am
19019
@@ -381,6 +420,7 @@
19024
# Tell versions [3.59,3.63) of GNU make to not export all variables.
19025
# Otherwise a system limit (for SysV at least) may be exceeded.
19027
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/8x8/Makefile.in gnome-icon-theme-2.27.90.new/8x8/Makefile.in
19028
--- gnome-icon-theme-2.27.90/8x8/Makefile.in 2009-08-13 03:45:51.000000000 +0200
19029
+++ gnome-icon-theme-2.27.90.new/8x8/Makefile.in 2009-08-27 12:38:31.000000000 +0200
19031
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
19032
+# Makefile.in generated by automake 1.11 from Makefile.am.
19033
# @configure_input@
19035
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
19036
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
19037
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
19039
# This Makefile.in is free software; the Free Software Foundation
19040
# gives unlimited permission to copy and/or distribute it,
19041
# with or without modifications, as long as this notice is preserved.
19045
pkgdatadir = $(datadir)/@PACKAGE@
19046
-pkglibdir = $(libdir)/@PACKAGE@
19047
pkgincludedir = $(includedir)/@PACKAGE@
19048
+pkglibdir = $(libdir)/@PACKAGE@
19049
+pkglibexecdir = $(libexecdir)/@PACKAGE@
19050
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
19051
install_sh_DATA = $(install_sh) -c -m 644
19052
install_sh_PROGRAM = $(install_sh) -c
19055
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
19056
CONFIG_CLEAN_FILES =
19057
+CONFIG_CLEAN_VPATH_FILES =
19060
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
19061
@@ -48,10 +51,38 @@
19062
ps-recursive uninstall-recursive
19063
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
19064
distclean-recursive maintainer-clean-recursive
19065
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
19066
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
19070
DIST_SUBDIRS = $(SUBDIRS)
19071
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
19072
+am__relativize = \
19074
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
19075
+ sed_rest='s,^[^/]*/*,,'; \
19076
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
19077
+ sed_butlast='s,/*[^/]*$$,,'; \
19078
+ while test -n "$$dir1"; do \
19079
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
19080
+ if test "$$first" != "."; then \
19081
+ if test "$$first" = ".."; then \
19082
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
19083
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
19085
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
19086
+ if test "$$first2" = "$$first"; then \
19087
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
19089
+ dir2="../$$dir2"; \
19091
+ dir0="$$dir0"/"$$first"; \
19094
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
19097
ACLOCAL = @ACLOCAL@
19098
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
19099
ALL_LINGUAS = @ALL_LINGUAS@
19100
@@ -108,6 +139,7 @@
19101
PACKAGE_NAME = @PACKAGE_NAME@
19102
PACKAGE_STRING = @PACKAGE_STRING@
19103
PACKAGE_TARNAME = @PACKAGE_TARNAME@
19104
+PACKAGE_URL = @PACKAGE_URL@
19105
PACKAGE_VERSION = @PACKAGE_VERSION@
19106
PATH_SEPARATOR = @PATH_SEPARATOR@
19107
PKG_CONFIG = @PKG_CONFIG@
19108
@@ -182,9 +214,9 @@
19112
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 8x8/Makefile'; \
19113
- cd $(top_srcdir) && \
19114
- $(AUTOMAKE) --gnu 8x8/Makefile
19115
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 8x8/Makefile'; \
19116
+ $(am__cd) $(top_srcdir) && \
19117
+ $(AUTOMAKE) --gnu 8x8/Makefile
19118
.PRECIOUS: Makefile
19119
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
19121
@@ -202,6 +234,7 @@
19122
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
19123
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
19124
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
19125
+$(am__aclocal_m4_deps):
19127
# This directory's subdirectories are mostly independent; you can cd
19128
# into them and run `make' without going through this Makefile.
19129
@@ -227,7 +260,7 @@
19131
local_target="$$target"; \
19133
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
19134
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
19135
|| eval $$failcom; \
19137
if test "$$dot_seen" = "no"; then \
19138
@@ -261,16 +294,16 @@
19140
local_target="$$target"; \
19142
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
19143
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
19144
|| eval $$failcom; \
19145
done && test -z "$$fail"
19147
list='$(SUBDIRS)'; for subdir in $$list; do \
19148
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
19149
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
19152
list='$(SUBDIRS)'; for subdir in $$list; do \
19153
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
19154
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
19157
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
19158
@@ -285,7 +318,7 @@
19160
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
19161
$(TAGS_FILES) $(LISP)
19165
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
19166
include_option=--etags-include; \
19167
@@ -297,7 +330,7 @@
19168
list='$(SUBDIRS)'; for subdir in $$list; do \
19169
if test "$$subdir" = .; then :; else \
19170
test ! -f $$subdir/TAGS || \
19171
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
19172
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
19175
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
19176
@@ -306,29 +339,34 @@
19178
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
19179
END { if (nonempty) { for (i in files) print i; }; }'`; \
19180
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
19182
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
19183
test -n "$$unique" || unique=$$empty_fix; \
19184
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
19185
- $$tags $$unique; \
19186
+ if test $$# -gt 0; then \
19187
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
19188
+ "$$@" $$unique; \
19190
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
19195
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
19196
$(TAGS_FILES) $(LISP)
19198
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
19199
unique=`for i in $$list; do \
19200
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
19202
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
19203
END { if (nonempty) { for (i in files) print i; }; }'`; \
19204
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
19205
+ test -z "$(CTAGS_ARGS)$$unique" \
19206
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
19211
here=`$(am__cd) $(top_builddir) && pwd` \
19212
- && cd $(top_srcdir) \
19213
- && gtags -i $(GTAGS_ARGS) $$here
19214
+ && $(am__cd) $(top_srcdir) \
19215
+ && gtags -i $(GTAGS_ARGS) "$$here"
19218
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
19219
@@ -349,29 +387,44 @@
19220
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
19221
if test -d $$d/$$file; then \
19222
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
19223
+ if test -d "$(distdir)/$$file"; then \
19224
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
19226
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
19227
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
19228
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
19229
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
19231
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
19232
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
19234
- test -f $(distdir)/$$file \
19235
- || cp -p $$d/$$file $(distdir)/$$file \
19236
+ test -f "$(distdir)/$$file" \
19237
+ || cp -p $$d/$$file "$(distdir)/$$file" \
19241
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
19242
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
19243
if test "$$subdir" = .; then :; else \
19244
test -d "$(distdir)/$$subdir" \
19245
|| $(MKDIR_P) "$(distdir)/$$subdir" \
19247
- distdir=`$(am__cd) $(distdir) && pwd`; \
19248
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
19249
- (cd $$subdir && \
19252
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
19253
+ if test "$$subdir" = .; then :; else \
19254
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
19255
+ $(am__relativize); \
19256
+ new_distdir=$$reldir; \
19257
+ dir1=$$subdir; dir2="$(top_distdir)"; \
19258
+ $(am__relativize); \
19259
+ new_top_distdir=$$reldir; \
19260
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
19261
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
19262
+ ($(am__cd) $$subdir && \
19263
$(MAKE) $(AM_MAKEFLAGS) \
19264
- top_distdir="$$top_distdir" \
19265
- distdir="$$distdir/$$subdir" \
19266
+ top_distdir="$$new_top_distdir" \
19267
+ distdir="$$new_distdir" \
19268
am__remove_distdir=: \
19269
am__skip_length_check=: \
19270
+ am__skip_mode_fix=: \
19274
@@ -401,6 +454,7 @@
19277
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
19278
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
19280
maintainer-clean-generic:
19281
@echo "This command is intended for maintainers to use"
19282
@@ -420,6 +474,8 @@
19284
html: html-recursive
19288
info: info-recursive
19291
@@ -428,18 +484,28 @@
19293
install-dvi: install-dvi-recursive
19299
install-html: install-html-recursive
19303
install-info: install-info-recursive
19309
install-pdf: install-pdf-recursive
19313
install-ps: install-ps-recursive
19319
maintainer-clean: maintainer-clean-recursive
19320
@@ -460,8 +526,8 @@
19324
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
19326
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
19327
+ install-am install-strip tags-recursive
19329
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
19330
all all-am check check-am clean clean-generic ctags \
19331
@@ -476,6 +542,7 @@
19332
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
19333
tags-recursive uninstall uninstall-am
19336
# Tell versions [3.59,3.63) of GNU make to not export all variables.
19337
# Otherwise a system limit (for SysV at least) may be exceeded.
19339
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/aclocal.m4 gnome-icon-theme-2.27.90.new/aclocal.m4
19340
--- gnome-icon-theme-2.27.90/aclocal.m4 2009-08-13 03:45:30.000000000 +0200
19341
+++ gnome-icon-theme-2.27.90.new/aclocal.m4 2009-08-27 12:38:22.000000000 +0200
19343
-# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
19344
+# generated automatically by aclocal 1.11 -*- Autoconf -*-
19346
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
19347
-# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
19348
+# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
19349
# This file is free software; the Free Software Foundation
19350
# gives unlimited permission to copy and/or distribute it,
19351
# with or without modifications, as long as this notice is preserved.
19354
m4_ifndef([AC_AUTOCONF_VERSION],
19355
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
19356
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
19357
-[m4_warning([this file was generated for autoconf 2.63.
19358
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
19359
+[m4_warning([this file was generated for autoconf 2.64.
19360
You have another version of autoconf. It may work, but is not guaranteed to.
19361
If you have problems, you may need to regenerate the build system entirely.
19362
To do so, use the procedure documented by the package, typically `autoreconf'.])])
19363
@@ -848,10 +848,10 @@
19364
# generated from the m4 files accompanying Automake X.Y.
19365
# (This private macro should not be called outside this file.)
19366
AC_DEFUN([AM_AUTOMAKE_VERSION],
19367
-[am__api_version='1.10'
19368
+[am__api_version='1.11'
19369
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
19370
dnl require some minimum version. Point them to the right macro.
19371
-m4_if([$1], [1.10.2], [],
19372
+m4_if([$1], [1.11], [],
19373
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
19376
@@ -867,7 +867,7 @@
19377
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
19378
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
19379
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
19380
-[AM_AUTOMAKE_VERSION([1.10.2])dnl
19381
+[AM_AUTOMAKE_VERSION([1.11])dnl
19382
m4_ifndef([AC_AUTOCONF_VERSION],
19383
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
19384
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
19385
@@ -927,14 +927,14 @@
19387
# AM_CONDITIONAL -*- Autoconf -*-
19389
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
19390
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
19391
# Free Software Foundation, Inc.
19393
# This file is free software; the Free Software Foundation
19394
# gives unlimited permission to copy and/or distribute it,
19395
# with or without modifications, as long as this notice is preserved.
19400
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
19401
# -------------------------------------
19402
@@ -947,6 +947,7 @@
19403
AC_SUBST([$1_FALSE])dnl
19404
_AM_SUBST_NOTMAKE([$1_TRUE])dnl
19405
_AM_SUBST_NOTMAKE([$1_FALSE])dnl
19406
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
19410
@@ -960,14 +961,14 @@
19411
Usually this means the macro was only invoked conditionally.]])
19414
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
19415
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
19416
# Free Software Foundation, Inc.
19418
# This file is free software; the Free Software Foundation
19419
# gives unlimited permission to copy and/or distribute it,
19420
# with or without modifications, as long as this notice is preserved.
19425
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
19426
# written in clear, in which case automake, when reading aclocal.m4,
19427
@@ -1024,6 +1025,16 @@
19428
if test "$am_compiler_list" = ""; then
19429
am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
19431
+ am__universal=false
19432
+ m4_case([$1], [CC],
19433
+ [case " $depcc " in #(
19434
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
19437
+ [case " $depcc " in #(
19438
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
19441
for depmode in $am_compiler_list; do
19442
# Setup a source with many dependencies, because some compilers
19443
# like to wrap large dependency lists on column 80 (with \), and
19444
@@ -1041,7 +1052,17 @@
19446
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
19448
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
19449
+ # mode. It turns out that the SunPro C++ compiler does not properly
19450
+ # handle `-M -o', and we need to detect this. Also, some Intel
19451
+ # versions had trouble with output in subdirs
19452
+ am__obj=sub/conftest.${OBJEXT-o}
19453
+ am__minus_obj="-o $am__obj"
19456
+ # This depmode causes a compiler race in universal mode.
19457
+ test "$am__universal" = false || continue
19460
# after this tag, mechanisms are not by side-effect, so they'll
19461
# only be used when explicitly requested
19462
@@ -1051,19 +1072,23 @@
19466
+ msvisualcpp | msvcmsys)
19467
+ # This compiler won't grok `-c -o', but also, the minuso test has
19468
+ # not run yet. These depmodes are late enough in the game, and
19469
+ # so weak that their functioning should not be impacted.
19470
+ am__obj=conftest.${OBJEXT-o}
19475
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
19476
- # mode. It turns out that the SunPro C++ compiler does not properly
19477
- # handle `-M -o', and we need to detect this.
19478
if depmode=$depmode \
19479
- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
19480
+ source=sub/conftest.c object=$am__obj \
19481
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
19482
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
19483
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
19484
>/dev/null 2>conftest.err &&
19485
grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
19486
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
19487
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
19488
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
19489
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
19490
# icc doesn't choke on unknown options, it will just issue warnings
19491
# or remarks (even with -Werror). So we grep stderr for any message
19492
@@ -1201,13 +1226,13 @@
19493
# Do all the work for Automake. -*- Autoconf -*-
19495
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
19496
-# 2005, 2006, 2008 Free Software Foundation, Inc.
19497
+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
19499
# This file is free software; the Free Software Foundation
19500
# gives unlimited permission to copy and/or distribute it,
19501
# with or without modifications, as long as this notice is preserved.
19506
# This macro actually does too much. Some checks are only needed if
19507
# your package does certain things. But this isn't really a big deal.
19508
@@ -1224,7 +1249,7 @@
19509
# arguments mandatory, and then we can depend on a new Autoconf
19510
# release and drop the old call support.
19511
AC_DEFUN([AM_INIT_AUTOMAKE],
19512
-[AC_PREREQ([2.60])dnl
19513
+[AC_PREREQ([2.62])dnl
19514
dnl Autoconf wants to disallow AM_ names. We explicitly allow
19515
dnl the ones we care about.
19516
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
19517
@@ -1275,8 +1300,8 @@
19518
AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
19519
AM_MISSING_PROG(AUTOHEADER, autoheader)
19520
AM_MISSING_PROG(MAKEINFO, makeinfo)
19521
-AM_PROG_INSTALL_SH
19522
-AM_PROG_INSTALL_STRIP
19523
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
19524
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
19525
AC_REQUIRE([AM_PROG_MKDIR_P])dnl
19526
# We need awk for the "check" target. The system "awk" is bad on
19528
@@ -1284,24 +1309,37 @@
19529
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
19530
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
19531
_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
19532
- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
19533
- [_AM_PROG_TAR([v7])])])
19534
+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
19535
+ [_AM_PROG_TAR([v7])])])
19536
_AM_IF_OPTION([no-dependencies],,
19537
[AC_PROVIDE_IFELSE([AC_PROG_CC],
19538
- [_AM_DEPENDENCIES(CC)],
19539
- [define([AC_PROG_CC],
19540
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
19541
+ [_AM_DEPENDENCIES(CC)],
19542
+ [define([AC_PROG_CC],
19543
+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
19544
AC_PROVIDE_IFELSE([AC_PROG_CXX],
19545
- [_AM_DEPENDENCIES(CXX)],
19546
- [define([AC_PROG_CXX],
19547
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
19548
+ [_AM_DEPENDENCIES(CXX)],
19549
+ [define([AC_PROG_CXX],
19550
+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
19551
AC_PROVIDE_IFELSE([AC_PROG_OBJC],
19552
- [_AM_DEPENDENCIES(OBJC)],
19553
- [define([AC_PROG_OBJC],
19554
- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
19555
+ [_AM_DEPENDENCIES(OBJC)],
19556
+ [define([AC_PROG_OBJC],
19557
+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
19559
+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
19560
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
19561
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
19562
+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
19563
+AC_CONFIG_COMMANDS_PRE(dnl
19564
+[m4_provide_if([_AM_COMPILER_EXEEXT],
19565
+ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
19568
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
19569
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
19570
+dnl mangled by Autoconf and run in a shell conditional statement.
19571
+m4_define([_AC_COMPILER_EXEEXT],
19572
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
19575
# When config.status generates a header, we must update the stamp-h file.
19576
# This file resides in the same directory as the config header
19577
@@ -1324,7 +1362,7 @@
19579
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
19581
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
19582
+# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
19584
# This file is free software; the Free Software Foundation
19585
# gives unlimited permission to copy and/or distribute it,
19586
@@ -1335,7 +1373,14 @@
19587
# Define $install_sh.
19588
AC_DEFUN([AM_PROG_INSTALL_SH],
19589
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
19590
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
19591
+if test x"${install_sh}" != xset; then
19592
+ case $am_aux_dir in
19594
+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
19596
+ install_sh="\${SHELL} $am_aux_dir/install-sh"
19599
AC_SUBST(install_sh)])
19601
# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
19602
@@ -1361,13 +1406,13 @@
19604
# Check to see how 'make' treats includes. -*- Autoconf -*-
19606
-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
19607
+# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
19609
# This file is free software; the Free Software Foundation
19610
# gives unlimited permission to copy and/or distribute it,
19611
# with or without modifications, as long as this notice is preserved.
19616
# AM_MAKE_INCLUDE()
19617
# -----------------
19618
@@ -1376,7 +1421,7 @@
19619
[am_make=${MAKE-make}
19620
cat > confinc << 'END'
19623
+ @echo this is the am__doit target
19626
# If we don't find an include directive, just comment out the code.
19627
@@ -1386,24 +1431,24 @@
19629
# First try GNU make style include.
19630
echo "include confinc" > confmf
19631
-# We grep out `Entering directory' and `Leaving directory'
19632
-# messages which can occur if `w' ends up in MAKEFLAGS.
19633
-# In particular we don't look at `^make:' because GNU make might
19634
-# be invoked under some other name (usually "gmake"), in which
19635
-# case it prints its new name instead of `make'.
19636
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
19637
- am__include=include
19641
+# Ignore all kinds of additional output from `make'.
19642
+case `$am_make -s -f confmf 2> /dev/null` in #(
19643
+*the\ am__doit\ target*)
19644
+ am__include=include
19649
# Now try BSD make style include.
19650
if test "$am__include" = "#"; then
19651
echo '.include "confinc"' > confmf
19652
- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
19653
- am__include=.include
19657
+ case `$am_make -s -f confmf 2> /dev/null` in #(
19658
+ *the\ am__doit\ target*)
19659
+ am__include=.include
19665
AC_SUBST([am__include])
19666
AC_SUBST([am__quote])
19667
@@ -1413,14 +1458,14 @@
19669
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
19671
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
19672
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
19673
# Free Software Foundation, Inc.
19675
# This file is free software; the Free Software Foundation
19676
# gives unlimited permission to copy and/or distribute it,
19677
# with or without modifications, as long as this notice is preserved.
19682
# AM_MISSING_PROG(NAME, PROGRAM)
19683
# ------------------------------
19684
@@ -1437,7 +1482,14 @@
19685
AC_DEFUN([AM_MISSING_HAS_RUN],
19686
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
19687
AC_REQUIRE_AUX_FILE([missing])dnl
19688
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
19689
+if test x"${MISSING+set}" != xset; then
19690
+ case $am_aux_dir in
19692
+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
19694
+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
19697
# Use eval to expand $SHELL
19698
if eval "$MISSING --run true"; then
19699
am_missing_run="$MISSING --run "
19700
@@ -1525,14 +1577,14 @@
19702
# Check to make sure that the build environment is sane. -*- Autoconf -*-
19704
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
19705
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
19706
# Free Software Foundation, Inc.
19708
# This file is free software; the Free Software Foundation
19709
# gives unlimited permission to copy and/or distribute it,
19710
# with or without modifications, as long as this notice is preserved.
19717
@@ -1541,16 +1593,29 @@
19720
echo timestamp > conftest.file
19721
+# Reject unsafe characters in $srcdir or the absolute working directory
19722
+# name. Accept space and tab only in the latter.
19726
+ *[[\\\"\#\$\&\'\`$am_lf]]*)
19727
+ AC_MSG_ERROR([unsafe absolute working directory name]);;
19730
+ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
19731
+ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
19734
# Do `set' in a subshell so we don't clobber the current shell's
19735
# arguments. Must try -L first in case configure is actually a
19736
# symlink; some systems play weird games with the mod time of symlinks
19737
# (eg FreeBSD returns the mod time of the symlink's containing
19740
- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
19741
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
19742
if test "$[*]" = "X"; then
19744
- set X `ls -t $srcdir/configure conftest.file`
19745
+ set X `ls -t "$srcdir/configure" conftest.file`
19747
rm -f conftest.file
19748
if test "$[*]" != "X $srcdir/configure conftest.file" \
19749
@@ -1603,18 +1668,25 @@
19750
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
19751
AC_SUBST([INSTALL_STRIP_PROGRAM])])
19753
-# Copyright (C) 2006 Free Software Foundation, Inc.
19754
+# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
19756
# This file is free software; the Free Software Foundation
19757
# gives unlimited permission to copy and/or distribute it,
19758
# with or without modifications, as long as this notice is preserved.
19762
# _AM_SUBST_NOTMAKE(VARIABLE)
19763
# ---------------------------
19764
# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
19765
# This macro is traced by Automake.
19766
AC_DEFUN([_AM_SUBST_NOTMAKE])
19768
+# AM_SUBST_NOTMAKE(VARIABLE)
19769
+# ---------------------------
19770
+# Public sister of _AM_SUBST_NOTMAKE.
19771
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
19773
# Check how to create a tarball. -*- Autoconf -*-
19775
# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
19776
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/configure gnome-icon-theme-2.27.90.new/configure
19777
--- gnome-icon-theme-2.27.90/configure 2009-08-13 03:45:32.000000000 +0200
19778
+++ gnome-icon-theme-2.27.90.new/configure 2009-08-27 12:38:23.000000000 +0200
19781
# Guess values for system-dependent variables and create Makefiles.
19782
-# Generated by GNU Autoconf 2.63 for gnome-icon-theme 2.27.90.
19783
+# Generated by GNU Autoconf 2.64 for gnome-icon-theme 2.27.90.
19785
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-icon-theme>.
19787
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
19788
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
19789
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
19790
+# Foundation, Inc.
147
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.28.0/aclocal.m4 gnome-icon-theme-2.28.0.new/aclocal.m4
148
--- gnome-icon-theme-2.28.0/aclocal.m4 2009-09-22 11:31:57.000000000 +1000
149
+++ gnome-icon-theme-2.28.0.new/aclocal.m4 2009-09-22 14:06:03.000000000 +1000
150
@@ -452,6 +452,200 @@
155
+dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
156
+# serial 40 IT_PROG_INTLTOOL
157
+AC_DEFUN([IT_PROG_INTLTOOL], [
158
+AC_PREREQ([2.50])dnl
159
+AC_REQUIRE([AM_NLS])dnl
161
+case "$am__api_version" in
163
+ AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
169
+if test -n "$1"; then
170
+ AC_MSG_CHECKING([for intltool >= $1])
172
+ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
173
+ INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
174
+ [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
176
+ AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
177
+ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
178
+ AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.])
181
+AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
182
+AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
183
+AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
184
+if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
185
+ AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
188
+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
189
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
190
+ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
191
+ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
192
+ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
193
+ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
194
+ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
195
+ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
196
+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
197
+ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
198
+ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
199
+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@'
200
+ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
201
+ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
202
+ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
203
+ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
204
+ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
205
+ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
206
+ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
208
+_IT_SUBST(INTLTOOL_DESKTOP_RULE)
209
+_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
210
+_IT_SUBST(INTLTOOL_KEYS_RULE)
211
+_IT_SUBST(INTLTOOL_PROP_RULE)
212
+_IT_SUBST(INTLTOOL_OAF_RULE)
213
+_IT_SUBST(INTLTOOL_PONG_RULE)
214
+_IT_SUBST(INTLTOOL_SERVER_RULE)
215
+_IT_SUBST(INTLTOOL_SHEET_RULE)
216
+_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
217
+_IT_SUBST(INTLTOOL_UI_RULE)
218
+_IT_SUBST(INTLTOOL_XAM_RULE)
219
+_IT_SUBST(INTLTOOL_KBD_RULE)
220
+_IT_SUBST(INTLTOOL_XML_RULE)
221
+_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
222
+_IT_SUBST(INTLTOOL_CAVES_RULE)
223
+_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
224
+_IT_SUBST(INTLTOOL_THEME_RULE)
225
+_IT_SUBST(INTLTOOL_SERVICE_RULE)
226
+_IT_SUBST(INTLTOOL_POLICY_RULE)
228
+# Check the gettext tools to make sure they are GNU
229
+AC_PATH_PROG(XGETTEXT, xgettext)
230
+AC_PATH_PROG(MSGMERGE, msgmerge)
231
+AC_PATH_PROG(MSGFMT, msgfmt)
232
+AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
233
+if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
234
+ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
236
+xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
237
+mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
238
+mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
239
+if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
240
+ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
243
+AC_PATH_PROG(INTLTOOL_PERL, perl)
244
+if test -z "$INTLTOOL_PERL"; then
245
+ AC_MSG_ERROR([perl not found])
247
+AC_MSG_CHECKING([for perl >= 5.8.1])
248
+$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
249
+if test $? -ne 0; then
250
+ AC_MSG_ERROR([perl 5.8.1 is required for intltool])
252
+ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
253
+ AC_MSG_RESULT([$IT_PERL_VERSION])
255
+if test "x$2" != "xno-xml"; then
256
+ AC_MSG_CHECKING([for XML::Parser])
257
+ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
258
+ AC_MSG_RESULT([ok])
260
+ AC_MSG_ERROR([XML::Parser perl module is required for intltool])
264
+# Substitute ALL_LINGUAS so we can use it in po/Makefile
265
+AC_SUBST(ALL_LINGUAS)
267
+# Set DATADIRNAME correctly if it is not set yet
268
+# (copied from glib-gettext.m4)
269
+if test -z "$DATADIRNAME"; then
271
+ [AC_LANG_PROGRAM([[]],
272
+ [[extern int _nl_msg_cat_cntr;
273
+ return _nl_msg_cat_cntr]])],
274
+ [DATADIRNAME=share],
277
+ dnl On Solaris, if bind_textdomain_codeset is in libc,
278
+ dnl GNU format message catalog is always supported,
279
+ dnl since both are added to the libc all together.
280
+ dnl Hence, we'd like to go with DATADIRNAME=share
282
+ AC_CHECK_FUNC(bind_textdomain_codeset,
283
+ [DATADIRNAME=share], [DATADIRNAME=lib])
290
+AC_SUBST(DATADIRNAME)
297
+# IT_PO_SUBDIR(DIRNAME)
298
+# ---------------------
299
+# All po subdirs have to be declared with this macro; the subdir "po" is
300
+# declared by IT_PROG_INTLTOOL.
19792
# This configure script is free software; the Free Software Foundation
19793
# gives unlimited permission to copy, distribute and modify it.
19794
-## --------------------- ##
19795
-## M4sh Initialization. ##
19796
-## --------------------- ##
19797
+## -------------------- ##
19798
+## M4sh Initialization. ##
19799
+## -------------------- ##
19801
# Be more Bourne compatible
19802
DUALCASE=1; export DUALCASE # for MKS sh
19803
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
19804
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
19807
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
19808
@@ -22,23 +24,15 @@
19809
alias -g '${1+"$@"}'='"$@"'
19810
setopt NO_GLOB_SUBST
19812
- case `(set -o) 2>/dev/null` in
19813
- *posix*) set -o posix ;;
19814
+ case `(set -o) 2>/dev/null` in #(
19816
+ set -o posix ;; #(
19827
-# Avoid depending upon Character Ranges.
19828
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
19829
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
19830
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
19831
-as_cr_digits='0123456789'
19832
-as_cr_alnum=$as_cr_Letters$as_cr_digits
19838
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
19839
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
19840
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
19841
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
19842
+# Prefer a ksh shell builtin over an external printf program on Solaris,
19843
+# but without wasting forks for bash or zsh.
19844
+if test -z "$BASH_VERSION$ZSH_VERSION" \
19845
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
19846
+ as_echo='print -r --'
19847
+ as_echo_n='print -rn --'
19848
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
19849
as_echo='printf %s\n'
19850
as_echo_n='printf %s'
19853
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
19854
as_echo_n_body='eval
19859
expr "X$arg" : "X\\(.*\\)$as_nl";
19860
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
19865
-# Support unset when possible.
19866
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
19874
# We need space, tab and new line, in precisely that order. Quoting is
19875
@@ -96,15 +89,15 @@
19878
# Find who we are. Look in the path if we contain no directory separator.
19881
*[\\/]* ) as_myself=$0 ;;
19882
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19883
for as_dir in $PATH
19886
test -z "$as_dir" && as_dir=.
19887
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
19889
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
19894
@@ -116,12 +109,16 @@
19896
if test ! -f "$as_myself"; then
19897
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
19898
- { (exit 1); exit 1; }
19902
-# Work around bugs in pre-3.0 UWIN ksh.
19903
-for as_var in ENV MAIL MAILPATH
19904
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
19905
+# Unset variables that we do not need and which cause bugs (e.g. in
19906
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
19907
+# suppresses any "Segmentation fault" message there. '((' could
19908
+# trigger a bug in pdksh 5.2.14.
19909
+for as_var in BASH_ENV ENV MAIL MAILPATH
19910
+do eval test x\${$as_var+set} = xset \
19911
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
19915
@@ -133,330 +130,301 @@
19919
-# Required to use basename.
19920
-if expr a : '\(a\)' >/dev/null 2>&1 &&
19921
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
19927
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
19928
- as_basename=basename
19930
- as_basename=false
19934
-# Name of the executable.
19935
-as_me=`$as_basename -- "$0" ||
19936
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
19937
- X"$0" : 'X\(//\)$' \| \
19938
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
19940
- sed '/^.*\/\([^/][^/]*\)\/*$/{
19957
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
19959
if test "x$CONFIG_SHELL" = x; then
19960
- if (eval ":") 2>/dev/null; then
19961
- as_have_required=yes
19962
+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
19965
+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
19966
+ # is contrary to our usage. Disable this feature.
19967
+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
19968
+ setopt NO_GLOB_SUBST
19970
- as_have_required=no
19971
+ case \`(set -o) 2>/dev/null\` in #(
19973
+ set -o posix ;; #(
19979
- if test $as_have_required = yes && (eval ":
19980
-(as_func_return () {
19983
-as_func_success () {
19986
-as_func_failure () {
19989
-as_func_ret_success () {
19992
-as_func_ret_failure () {
19996
+ as_required="as_fn_return () { (exit \$1); }
19997
+as_fn_success () { as_fn_return 0; }
19998
+as_fn_failure () { as_fn_return 1; }
19999
+as_fn_ret_success () { return 0; }
20000
+as_fn_ret_failure () { return 1; }
20003
-if as_func_success; then
20007
- echo as_func_success failed.
20010
-if as_func_failure; then
20012
- echo as_func_failure succeeded.
20015
-if as_func_ret_success; then
20019
- echo as_func_ret_success failed.
20022
-if as_func_ret_failure; then
20024
- echo as_func_ret_failure succeeded.
20027
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
20029
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
20030
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
20031
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
20032
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
20033
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
20036
+ exitcode=1; echo positional parameters were not saved.
20038
+test x\$exitcode = x0 || exit 1"
20039
+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
20040
+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
20041
+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
20042
+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
20043
+test \$(( 1 + 1 )) = 2 || exit 1"
20044
+ if (eval "$as_required") 2>/dev/null; then :
20045
+ as_have_required=yes
20048
- echo positional parameters were not saved.
20049
+ as_have_required=no
20051
+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
20053
-test \$exitcode = 0) || { (exit 1); exit 1; }
20056
- as_lineno_1=\$LINENO
20057
- as_lineno_2=\$LINENO
20058
- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
20059
- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
20060
-") 2> /dev/null; then
20063
- as_candidate_shells=
20064
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
20065
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
20067
for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
20070
test -z "$as_dir" && as_dir=.
20073
+ case $as_dir in #(
20075
for as_base in sh bash ksh sh5; do
20076
- as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
20077
+ # Try only shells that exist, to save several forks.
20078
+ as_shell=$as_dir/$as_base
20079
+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
20080
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
20081
+ CONFIG_SHELL=$as_shell as_have_required=yes
20082
+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
20090
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
20091
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
20092
+ CONFIG_SHELL=$SHELL as_have_required=yes
20097
- for as_shell in $as_candidate_shells $SHELL; do
20098
- # Try only shells that exist, to save several forks.
20099
- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
20100
- { ("$as_shell") 2> /dev/null <<\_ASEOF
20101
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
20104
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
20105
- # is contrary to our usage. Disable this feature.
20106
- alias -g '${1+"$@"}'='"$@"'
20107
- setopt NO_GLOB_SUBST
20109
- case `(set -o) 2>/dev/null` in
20110
- *posix*) set -o posix ;;
20119
- CONFIG_SHELL=$as_shell
20120
- as_have_required=yes
20121
- if { "$as_shell" 2> /dev/null <<\_ASEOF
20122
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
20125
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
20126
- # is contrary to our usage. Disable this feature.
20127
- alias -g '${1+"$@"}'='"$@"'
20128
- setopt NO_GLOB_SUBST
20130
- case `(set -o) 2>/dev/null` in
20131
- *posix*) set -o posix ;;
20138
-(as_func_return () {
20141
-as_func_success () {
20144
-as_func_failure () {
20147
-as_func_ret_success () {
20150
-as_func_ret_failure () {
20155
-if as_func_success; then
20159
- echo as_func_success failed.
20162
-if as_func_failure; then
20164
- echo as_func_failure succeeded.
20167
-if as_func_ret_success; then
20171
- echo as_func_ret_success failed.
20174
-if as_func_ret_failure; then
20176
- echo as_func_ret_failure succeeded.
20177
+ if test "x$CONFIG_SHELL" != x; then :
20178
+ # We cannot yet assume a decent shell, so we have to provide a
20179
+ # neutralization value for shells without unset; and this also
20180
+ # works around shells that cannot unset nonexistent variables.
20181
+ BASH_ENV=/dev/null
20183
+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
20184
+ export CONFIG_SHELL
20185
+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
20188
-if ( set x; as_func_ret_success y && test x = "$1" ); then
20192
- echo positional parameters were not saved.
20193
+ if test x$as_have_required = xno; then :
20194
+ $as_echo "$0: This script requires a shell more modern than all"
20195
+ $as_echo "$0: the shells that I found on your system."
20196
+ if test x${ZSH_VERSION+set} = xset ; then
20197
+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
20198
+ $as_echo "$0: be upgraded to zsh 4.3.4 or later."
20200
+ $as_echo "$0: Please tell bug-autoconf@gnu.org and
20201
+$0: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-icon-theme
20202
+$0: about your system, including any error possibly output
20203
+$0: before this message. Then install a modern shell, or
20204
+$0: manually run the script under such a shell if you do
20210
-test $exitcode = 0) || { (exit 1); exit 1; }
20213
- as_lineno_1=$LINENO
20214
- as_lineno_2=$LINENO
20215
- test "x$as_lineno_1" != "x$as_lineno_2" &&
20216
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
20224
+SHELL=${CONFIG_SHELL-/bin/sh}
20226
+# Unset more variables known to interfere with behavior of common tools.
20227
+CLICOLOR_FORCE= GREP_OPTIONS=
20228
+unset CLICOLOR_FORCE GREP_OPTIONS
20232
- if test "x$CONFIG_SHELL" != x; then
20233
- for as_var in BASH_ENV ENV
20234
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
20236
- export CONFIG_SHELL
20237
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
20239
+## --------------------- ##
20240
+## M4sh Shell Functions. ##
20241
+## --------------------- ##
20244
+# Portably unset VAR.
20247
+ { eval $1=; unset $1;}
20249
+as_unset=as_fn_unset
20251
+# as_fn_set_status STATUS
20252
+# -----------------------
20253
+# Set $? to STATUS, without forking.
20254
+as_fn_set_status ()
20257
+} # as_fn_set_status
20259
- if test $as_have_required = no; then
20260
- echo This script requires a shell more modern than all the
20261
- echo shells that I found on your system. Please install a
20262
- echo modern shell, or manually run the script under such a
20263
- echo shell if you do have one.
20264
- { (exit 1); exit 1; }
20266
+# as_fn_exit STATUS
20267
+# -----------------
20268
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
20272
+ as_fn_set_status $1
20278
+# Create "$as_dir" as a directory, including parents if necessary.
20282
+ case $as_dir in #(
20283
+ -*) as_dir=./$as_dir;;
20285
+ test -d "$as_dir" || eval $as_mkdir_p || {
20288
+ case $as_dir in #(
20289
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
20290
+ *) as_qdir=$as_dir;;
20292
+ as_dirs="'$as_qdir' $as_dirs"
20293
+ as_dir=`$as_dirname -- "$as_dir" ||
20294
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
20295
+ X"$as_dir" : 'X\(//\)[^/]' \| \
20296
+ X"$as_dir" : 'X\(//\)$' \| \
20297
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
20298
+$as_echo X"$as_dir" |
20299
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
20303
+ /^X\(\/\/\)[^/].*/{
20316
+ test -d "$as_dir" && break
20318
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
20319
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
20325
+# as_fn_append VAR VALUE
20326
+# ----------------------
20327
+# Append the text in VALUE to the end of the definition contained in VAR. Take
20328
+# advantage of any shell optimizations that allow amortized linear growth over
20329
+# repeated appends, instead of the typical quadratic growth present in naive
20330
+# implementations.
20331
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
20332
+ eval 'as_fn_append ()
20343
+# as_fn_arith ARG...
20344
+# ------------------
20345
+# Perform arithmetic evaluation on the ARGs, and store the result in the
20346
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
20347
+# must be portable across $(()) and expr.
20348
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
20349
+ eval 'as_fn_arith ()
20356
+ as_val=`expr "$@" || test $? -eq 1`
20361
-(eval "as_func_return () {
20364
-as_func_success () {
20367
-as_func_failure () {
20370
-as_func_ret_success () {
20373
-as_func_ret_failure () {
20376
+# as_fn_error ERROR [LINENO LOG_FD]
20377
+# ---------------------------------
20378
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
20379
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
20380
+# script with status $?, using 1 if that was 0.
20383
+ as_status=$?; test $as_status -eq 0 && as_status=1
20384
+ if test "$3"; then
20385
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
20386
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
20388
+ $as_echo "$as_me: error: $1" >&2
20389
+ as_fn_exit $as_status
20393
-if as_func_success; then
20395
+if expr a : '\(a\)' >/dev/null 2>&1 &&
20396
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
20400
- echo as_func_success failed.
20403
-if as_func_failure; then
20405
- echo as_func_failure succeeded.
20409
-if as_func_ret_success; then
20411
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
20412
+ as_basename=basename
20415
- echo as_func_ret_success failed.
20418
-if as_func_ret_failure; then
20420
- echo as_func_ret_failure succeeded.
20421
+ as_basename=false
20424
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
20426
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
20427
+ as_dirname=dirname
20430
- echo positional parameters were not saved.
20434
-test \$exitcode = 0") || {
20435
- echo No shell found that supports shell functions.
20436
- echo Please tell bug-autoconf@gnu.org about your system,
20437
- echo including any error possibly output before this message.
20438
- echo This can help us improve future autoconf versions.
20439
- echo Configuration will now proceed without shell functions.
20441
+as_me=`$as_basename -- "$0" ||
20442
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
20443
+ X"$0" : 'X\(//\)$' \| \
20444
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
20446
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
20460
+# Avoid depending upon Character Ranges.
20461
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
20462
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
20463
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
20464
+as_cr_digits='0123456789'
20465
+as_cr_alnum=$as_cr_Letters$as_cr_digits
20468
- as_lineno_1=$LINENO
20469
- as_lineno_2=$LINENO
20470
- test "x$as_lineno_1" != "x$as_lineno_2" &&
20471
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
20473
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
20474
- # uniformly replaced by the line number. The first 'sed' inserts a
20475
- # line-number line after each line using $LINENO; the second 'sed'
20476
- # does the real work. The second script uses 'N' to pair each
20477
- # line-number line with the line containing $LINENO, and appends
20478
- # trailing '-' during substitution so that $LINENO is not a special
20479
- # case at line end.
20480
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
20481
- # scripts with optimization help from Paolo Bonzini. Blame Lee
20482
- # E. McMahon (1931-1989) for sed's syntax. :-)
20483
+ as_lineno_1=$LINENO as_lineno_1a=$LINENO
20484
+ as_lineno_2=$LINENO as_lineno_2a=$LINENO
20485
+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
20486
+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
20487
+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
20491
@@ -473,8 +441,7 @@
20493
' >$as_me.lineno &&
20494
chmod +x "$as_me.lineno" ||
20495
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
20496
- { (exit 1); exit 1; }; }
20497
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
20499
# Don't try to exec as it changes $[0], causing all sort of problems
20500
# (the dirname of $[0] is not the place where we might find the
20501
@@ -484,29 +451,18 @@
20506
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
20507
- as_dirname=dirname
20512
ECHO_C= ECHO_N= ECHO_T=
20513
-case `echo -n x` in
20514
+case `echo -n x` in #(((((
20516
- case `echo 'x\c'` in
20517
+ case `echo 'xy\c'` in
20518
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
20520
+ xy) ECHO_C='\c';;
20521
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
20527
-if expr a : '\(a\)' >/dev/null 2>&1 &&
20528
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
20534
rm -f conf$$ conf$$.exe conf$$.file
20535
if test -d conf$$.dir; then
20536
@@ -536,7 +492,7 @@
20537
rmdir conf$$.dir 2>/dev/null
20539
if mkdir -p . 2>/dev/null; then
20541
+ as_mkdir_p='mkdir -p "$as_dir"'
20543
test -d ./-p && rmdir ./-p
20545
@@ -555,10 +511,10 @@
20546
if test -d "$1"; then
20553
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
20554
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
20555
???[sx]*):;;*)false;;esac;fi
20558
@@ -572,7 +528,6 @@
20559
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
20563
exec 7<&0 </dev/null 6>&1
20565
# Name of the host.
20566
@@ -591,7 +546,6 @@
20570
-SHELL=${CONFIG_SHELL-/bin/sh}
20572
# Identity of this package.
20573
PACKAGE_NAME='gnome-icon-theme'
20574
@@ -599,6 +553,7 @@
20575
PACKAGE_VERSION='2.27.90'
20576
PACKAGE_STRING='gnome-icon-theme 2.27.90'
20577
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-icon-theme'
20580
ac_unique_file="index.theme.in"
20581
# Factoring default headers for most tests.
20582
@@ -637,7 +592,9 @@
20583
# include <unistd.h>
20586
-ac_subst_vars='LTLIBOBJS
20587
+ac_subst_vars='am__EXEEXT_FALSE
20593
@@ -757,6 +714,7 @@
20594
program_transform_name
20601
@@ -889,8 +847,7 @@
20602
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
20603
# Reject names that are not valid shell variable names.
20604
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
20605
- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
20606
- { (exit 1); exit 1; }; }
20607
+ as_fn_error "invalid feature name: $ac_useropt"
20608
ac_useropt_orig=$ac_useropt
20609
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
20610
case $ac_user_opts in
20611
@@ -916,8 +873,7 @@
20612
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
20613
# Reject names that are not valid shell variable names.
20614
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
20615
- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
20616
- { (exit 1); exit 1; }; }
20617
+ as_fn_error "invalid feature name: $ac_useropt"
20618
ac_useropt_orig=$ac_useropt
20619
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
20620
case $ac_user_opts in
20621
@@ -1121,8 +1077,7 @@
20622
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
20623
# Reject names that are not valid shell variable names.
20624
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
20625
- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
20626
- { (exit 1); exit 1; }; }
20627
+ as_fn_error "invalid package name: $ac_useropt"
20628
ac_useropt_orig=$ac_useropt
20629
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
20630
case $ac_user_opts in
20631
@@ -1138,8 +1093,7 @@
20632
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
20633
# Reject names that are not valid shell variable names.
20634
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
20635
- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
20636
- { (exit 1); exit 1; }; }
20637
+ as_fn_error "invalid package name: $ac_useropt"
20638
ac_useropt_orig=$ac_useropt
20639
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
20640
case $ac_user_opts in
20641
@@ -1169,17 +1123,17 @@
20642
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
20643
x_libraries=$ac_optarg ;;
20645
- -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
20646
-Try \`$0 --help' for more information." >&2
20647
- { (exit 1); exit 1; }; }
20648
+ -*) as_fn_error "unrecognized option: \`$ac_option'
20649
+Try \`$0 --help' for more information."
20653
ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
20654
# Reject names that are not valid shell variable names.
20655
- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
20656
- { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
20657
- { (exit 1); exit 1; }; }
20658
+ case $ac_envvar in #(
20659
+ '' | [0-9]* | *[!_$as_cr_alnum]* )
20660
+ as_fn_error "invalid variable name: \`$ac_envvar'" ;;
20662
eval $ac_envvar=\$ac_optarg
20663
export $ac_envvar ;;
20665
@@ -1196,15 +1150,13 @@
20667
if test -n "$ac_prev"; then
20668
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
20669
- { $as_echo "$as_me: error: missing argument to $ac_option" >&2
20670
- { (exit 1); exit 1; }; }
20671
+ as_fn_error "missing argument to $ac_option"
20674
if test -n "$ac_unrecognized_opts"; then
20675
case $enable_option_checking in
20677
- fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
20678
- { (exit 1); exit 1; }; } ;;
20679
+ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
20680
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
20683
@@ -1227,8 +1179,7 @@
20684
[\\/$]* | ?:[\\/]* ) continue;;
20685
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
20687
- { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
20688
- { (exit 1); exit 1; }; }
20689
+ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
20692
# There might be people who depend on the old broken behavior: `$host'
20693
@@ -1258,11 +1209,9 @@
20694
ac_pwd=`pwd` && test -n "$ac_pwd" &&
20695
ac_ls_di=`ls -di .` &&
20696
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
20697
- { $as_echo "$as_me: error: working directory cannot be determined" >&2
20698
- { (exit 1); exit 1; }; }
20699
+ as_fn_error "working directory cannot be determined"
20700
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
20701
- { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
20702
- { (exit 1); exit 1; }; }
20703
+ as_fn_error "pwd does not report name of working directory"
20706
# Find the source files, if location was not specified.
20707
@@ -1301,13 +1250,11 @@
20709
if test ! -r "$srcdir/$ac_unique_file"; then
20710
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
20711
- { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
20712
- { (exit 1); exit 1; }; }
20713
+ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
20715
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
20717
- cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
20718
- { (exit 1); exit 1; }; }
20719
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
20721
# When building in place, set srcdir=.
20722
if test "$ac_abs_confdir" = "$ac_pwd"; then
20723
@@ -1491,21 +1438,378 @@
20724
if $ac_init_version; then
20726
gnome-icon-theme configure 2.27.90
20727
-generated by GNU Autoconf 2.63
20728
+generated by GNU Autoconf 2.64
20730
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
20731
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
20732
+Copyright (C) 2009 Free Software Foundation, Inc.
20733
This configure script is free software; the Free Software Foundation
20734
gives unlimited permission to copy, distribute and modify it.
20739
+## ------------------------ ##
20740
+## Autoconf initialization. ##
20741
+## ------------------------ ##
20743
+# ac_fn_c_try_compile LINENO
20744
+# --------------------------
20745
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
20746
+ac_fn_c_try_compile ()
20748
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
20749
+ rm -f conftest.$ac_objext
20750
+ if { { ac_try="$ac_compile"
20751
+case "(($ac_try" in
20752
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20753
+ *) ac_try_echo=$ac_try;;
20755
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
20756
+$as_echo "$ac_try_echo"; } >&5
20757
+ (eval "$ac_compile") 2>conftest.err
20759
+ if test -s conftest.err; then
20760
+ grep -v '^ *+' conftest.err >conftest.er1
20761
+ cat conftest.er1 >&5
20762
+ mv -f conftest.er1 conftest.err
20764
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
20765
+ test $ac_status = 0; } && {
20766
+ test -z "$ac_c_werror_flag" ||
20767
+ test ! -s conftest.err
20768
+ } && test -s conftest.$ac_objext; then :
20771
+ $as_echo "$as_me: failed program was:" >&5
20772
+sed 's/^/| /' conftest.$ac_ext >&5
20776
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
20777
+ return $ac_retval
20779
+} # ac_fn_c_try_compile
20781
+# ac_fn_c_try_link LINENO
20782
+# -----------------------
20783
+# Try to link conftest.$ac_ext, and return whether this succeeded.
20784
+ac_fn_c_try_link ()
20786
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
20787
+ rm -f conftest.$ac_objext conftest$ac_exeext
20788
+ if { { ac_try="$ac_link"
20789
+case "(($ac_try" in
20790
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20791
+ *) ac_try_echo=$ac_try;;
20793
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
20794
+$as_echo "$ac_try_echo"; } >&5
20795
+ (eval "$ac_link") 2>conftest.err
20797
+ if test -s conftest.err; then
20798
+ grep -v '^ *+' conftest.err >conftest.er1
20799
+ cat conftest.er1 >&5
20800
+ mv -f conftest.er1 conftest.err
20802
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
20803
+ test $ac_status = 0; } && {
20804
+ test -z "$ac_c_werror_flag" ||
20805
+ test ! -s conftest.err
20806
+ } && test -s conftest$ac_exeext && {
20807
+ test "$cross_compiling" = yes ||
20808
+ $as_test_x conftest$ac_exeext
20812
+ $as_echo "$as_me: failed program was:" >&5
20813
+sed 's/^/| /' conftest.$ac_ext >&5
20817
+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
20818
+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
20819
+ # interfere with the next link command; also delete a directory that is
20820
+ # left behind by Apple's compiler. We do this before executing the actions.
20821
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
20822
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
20823
+ return $ac_retval
20825
+} # ac_fn_c_try_link
20827
+# ac_fn_c_check_func LINENO FUNC VAR
20828
+# ----------------------------------
20829
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
20830
+ac_fn_c_check_func ()
20832
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
20833
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
20834
+$as_echo_n "checking for $2... " >&6; }
20835
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
20836
+ $as_echo_n "(cached) " >&6
20838
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
20839
+/* end confdefs.h. */
20840
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
20841
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
20842
+#define $2 innocuous_$2
20844
+/* System header to define __stub macros and hopefully few prototypes,
20845
+ which can conflict with char $2 (); below.
20846
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
20847
+ <limits.h> exists even on freestanding compilers. */
20850
+# include <limits.h>
20852
+# include <assert.h>
20857
+/* Override any GCC internal prototype to avoid an error.
20858
+ Use char because int might match the return type of a GCC
20859
+ builtin and then its argument prototype would still apply. */
20860
+#ifdef __cplusplus
20864
+/* The GNU C library defines this for functions which it implements
20865
+ to always fail with ENOSYS. Some functions are actually named
20866
+ something starting with __ and the normal name is an alias. */
20867
+#if defined __stub_$2 || defined __stub___$2
20879
+if ac_fn_c_try_link "$LINENO"; then :
20884
+rm -f core conftest.err conftest.$ac_objext \
20885
+ conftest$ac_exeext conftest.$ac_ext
20888
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
20889
+$as_echo "$ac_res" >&6; }
20890
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
20892
+} # ac_fn_c_check_func
20894
+# ac_fn_c_try_cpp LINENO
20895
+# ----------------------
20896
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
20897
+ac_fn_c_try_cpp ()
20899
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
20900
+ if { { ac_try="$ac_cpp conftest.$ac_ext"
20901
+case "(($ac_try" in
20902
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20903
+ *) ac_try_echo=$ac_try;;
20905
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
20906
+$as_echo "$ac_try_echo"; } >&5
20907
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
20909
+ if test -s conftest.err; then
20910
+ grep -v '^ *+' conftest.err >conftest.er1
20911
+ cat conftest.er1 >&5
20912
+ mv -f conftest.er1 conftest.err
20914
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
20915
+ test $ac_status = 0; } >/dev/null && {
20916
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
20917
+ test ! -s conftest.err
20921
+ $as_echo "$as_me: failed program was:" >&5
20922
+sed 's/^/| /' conftest.$ac_ext >&5
20926
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
20927
+ return $ac_retval
20929
+} # ac_fn_c_try_cpp
20931
+# ac_fn_c_try_run LINENO
20932
+# ----------------------
20933
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
20934
+# that executables *can* be run.
20935
+ac_fn_c_try_run ()
20937
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
20938
+ if { { ac_try="$ac_link"
20939
+case "(($ac_try" in
20940
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20941
+ *) ac_try_echo=$ac_try;;
20943
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
20944
+$as_echo "$ac_try_echo"; } >&5
20945
+ (eval "$ac_link") 2>&5
20947
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
20948
+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
20949
+ { { case "(($ac_try" in
20950
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20951
+ *) ac_try_echo=$ac_try;;
20953
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
20954
+$as_echo "$ac_try_echo"; } >&5
20955
+ (eval "$ac_try") 2>&5
20957
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
20958
+ test $ac_status = 0; }; }; then :
20961
+ $as_echo "$as_me: program exited with status $ac_status" >&5
20962
+ $as_echo "$as_me: failed program was:" >&5
20963
+sed 's/^/| /' conftest.$ac_ext >&5
20965
+ ac_retval=$ac_status
20967
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
20968
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
20969
+ return $ac_retval
20971
+} # ac_fn_c_try_run
20973
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
20974
+# -------------------------------------------------------
20975
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
20976
+# the include files in INCLUDES and setting the cache variable VAR
20978
+ac_fn_c_check_header_mongrel ()
20980
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
20981
+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
20982
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
20983
+$as_echo_n "checking for $2... " >&6; }
20984
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
20985
+ $as_echo_n "(cached) " >&6
20988
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
20989
+$as_echo "$ac_res" >&6; }
20991
+ # Is the header compilable?
20992
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
20993
+$as_echo_n "checking $2 usability... " >&6; }
20994
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
20995
+/* end confdefs.h. */
20999
+if ac_fn_c_try_compile "$LINENO"; then :
21000
+ ac_header_compiler=yes
21002
+ ac_header_compiler=no
21004
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
21005
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
21006
+$as_echo "$ac_header_compiler" >&6; }
21008
+# Is the header present?
21009
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
21010
+$as_echo_n "checking $2 presence... " >&6; }
21011
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
21012
+/* end confdefs.h. */
21015
+if ac_fn_c_try_cpp "$LINENO"; then :
21016
+ ac_header_preproc=yes
21018
+ ac_header_preproc=no
21020
+rm -f conftest.err conftest.$ac_ext
21021
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
21022
+$as_echo "$ac_header_preproc" >&6; }
21024
+# So? What about this header?
21025
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
21027
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
21028
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
21029
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
21030
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
21033
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
21034
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
21035
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
21036
+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
21037
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
21038
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
21039
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
21040
+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
21041
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
21042
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
21044
+## ------------------------------------------------------------------------------- ##
21045
+## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-icon-theme ##
21046
+## ------------------------------------------------------------------------------- ##
21048
+ ) | sed "s/^/$as_me: WARNING: /" >&2
21051
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
21052
+$as_echo_n "checking for $2... " >&6; }
21053
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
21054
+ $as_echo_n "(cached) " >&6
21056
+ eval "$3=\$ac_header_compiler"
21059
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
21060
+$as_echo "$ac_res" >&6; }
21062
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
21064
+} # ac_fn_c_check_header_mongrel
21066
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
21067
+# -------------------------------------------------------
21068
+# Tests whether HEADER exists and can be compiled using the include files in
21069
+# INCLUDES, setting the cache variable VAR accordingly.
21070
+ac_fn_c_check_header_compile ()
21072
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
21073
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
21074
+$as_echo_n "checking for $2... " >&6; }
21075
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
21076
+ $as_echo_n "(cached) " >&6
21078
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
21079
+/* end confdefs.h. */
21083
+if ac_fn_c_try_compile "$LINENO"; then :
21088
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
21091
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
21092
+$as_echo "$ac_res" >&6; }
21093
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
21095
+} # ac_fn_c_check_header_compile
21096
cat >config.log <<_ACEOF
21097
This file contains any messages produced by compilers while
21098
running configure, to aid debugging if configure makes a mistake.
21100
It was created by gnome-icon-theme $as_me 2.27.90, which was
21101
-generated by GNU Autoconf 2.63. Invocation command line was
21102
+generated by GNU Autoconf 2.64. Invocation command line was
21106
@@ -1541,8 +1845,8 @@
21109
test -z "$as_dir" && as_dir=.
21110
- $as_echo "PATH: $as_dir"
21112
+ $as_echo "PATH: $as_dir"
21117
@@ -1579,9 +1883,9 @@
21118
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
21121
- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
21122
+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
21124
- ac_configure_args1="$ac_configure_args1 '$ac_arg'"
21125
+ as_fn_append ac_configure_args1 " '$ac_arg'"
21126
if test $ac_must_keep_next = true; then
21127
ac_must_keep_next=false # Got value, back to normal.
21129
@@ -1597,13 +1901,13 @@
21130
-* ) ac_must_keep_next=true ;;
21133
- ac_configure_args="$ac_configure_args '$ac_arg'"
21134
+ as_fn_append ac_configure_args " '$ac_arg'"
21139
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
21140
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
21141
+{ ac_configure_args0=; unset ac_configure_args0;}
21142
+{ ac_configure_args1=; unset ac_configure_args1;}
21144
# When interrupted or exit'd, cleanup temporary files, and complete
21145
# config.log. We remove comments because anyway the quotes in there
21146
@@ -1628,13 +1932,13 @@
21150
- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
21151
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
21152
$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
21155
_ | IFS | as_nl) ;; #(
21156
BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
21157
- *) $as_unset $ac_var ;;
21158
+ *) { eval $ac_var=; unset $ac_var;} ;;
21162
@@ -1706,39 +2010,41 @@
21165
for ac_signal in 1 2 13 15; do
21166
- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
21167
+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
21171
# confdefs.h avoids OS command line length limits that DEFS can exceed.
21172
rm -f -r conftest* confdefs.h
21174
+$as_echo "/* confdefs.h */" > confdefs.h
21176
# Predefined preprocessor variables.
21178
cat >>confdefs.h <<_ACEOF
21179
#define PACKAGE_NAME "$PACKAGE_NAME"
21183
cat >>confdefs.h <<_ACEOF
21184
#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
21188
cat >>confdefs.h <<_ACEOF
21189
#define PACKAGE_VERSION "$PACKAGE_VERSION"
21193
cat >>confdefs.h <<_ACEOF
21194
#define PACKAGE_STRING "$PACKAGE_STRING"
21198
cat >>confdefs.h <<_ACEOF
21199
#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
21202
+cat >>confdefs.h <<_ACEOF
21203
+#define PACKAGE_URL "$PACKAGE_URL"
21207
# Let the site file select an alternate cache file if it wants to.
21208
# Prefer an explicitly selected file to automatically selected ones.
21209
@@ -1757,7 +2063,7 @@
21211
test "x$ac_site_file" = xNONE && continue
21212
if test -r "$ac_site_file"; then
21213
- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
21214
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
21215
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
21216
sed 's/^/| /' "$ac_site_file" >&5
21218
@@ -1768,7 +2074,7 @@
21219
# Some versions of bash will fail to source /dev/null (special
21220
# files actually), so we avoid doing that.
21221
if test -f "$cache_file"; then
21222
- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
21223
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
21224
$as_echo "$as_me: loading cache $cache_file" >&6;}
21225
case $cache_file in
21226
[\\/]* | ?:[\\/]* ) . "$cache_file";;
21227
@@ -1776,7 +2082,7 @@
21231
- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
21232
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
21233
$as_echo "$as_me: creating cache $cache_file" >&6;}
21236
@@ -1791,11 +2097,11 @@
21237
eval ac_new_val=\$ac_env_${ac_var}_value
21238
case $ac_old_set,$ac_new_set in
21240
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
21241
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
21242
$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
21243
ac_cache_corrupted=: ;;
21245
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
21246
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
21247
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
21248
ac_cache_corrupted=: ;;
21250
@@ -1805,17 +2111,17 @@
21251
ac_old_val_w=`echo x $ac_old_val`
21252
ac_new_val_w=`echo x $ac_new_val`
21253
if test "$ac_old_val_w" != "$ac_new_val_w"; then
21254
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
21255
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
21256
$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
21257
ac_cache_corrupted=:
21259
- { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
21260
+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
21261
$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
21262
eval $ac_var=\$ac_old_val
21264
- { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
21265
+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
21266
$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
21267
- { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
21268
+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
21269
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
21272
@@ -1827,43 +2133,20 @@
21274
case " $ac_configure_args " in
21275
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
21276
- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
21277
+ *) as_fn_append ac_configure_args " '$ac_arg'" ;;
21281
if $ac_cache_corrupted; then
21282
- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
21283
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
21284
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
21285
- { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
21286
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
21287
$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
21288
- { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
21289
-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
21290
- { (exit 1); exit 1; }; }
21291
+ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
21317
+## -------------------- ##
21318
+## Main body of script. ##
21319
+## -------------------- ##
21322
ac_cpp='$CPP $CPPFLAGS'
21323
@@ -1874,28 +2157,20 @@
21327
-am__api_version='1.10'
21328
+am__api_version='1.11'
21331
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
21332
- if test -f "$ac_dir/install-sh"; then
21333
- ac_aux_dir=$ac_dir
21334
- ac_install_sh="$ac_aux_dir/install-sh -c"
21336
- elif test -f "$ac_dir/install.sh"; then
21337
- ac_aux_dir=$ac_dir
21338
- ac_install_sh="$ac_aux_dir/install.sh -c"
21340
- elif test -f "$ac_dir/shtool"; then
21341
- ac_aux_dir=$ac_dir
21342
- ac_install_sh="$ac_aux_dir/shtool install -c"
21345
+ for ac_t in install-sh install.sh shtool; do
21346
+ if test -f "$ac_dir/$ac_t"; then
21347
+ ac_aux_dir=$ac_dir
21348
+ ac_install_sh="$ac_aux_dir/$ac_t -c"
302
+AC_DEFUN([IT_PO_SUBDIR],
303
+[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
305
+dnl The following CONFIG_COMMANDS should be exetuted at the very end
306
+dnl of config.status.
307
+AC_CONFIG_COMMANDS_PRE([
308
+ AC_CONFIG_COMMANDS([$1/stamp-it], [
309
+ if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
310
+ AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
21353
if test -z "$ac_aux_dir"; then
21354
- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
21355
-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
21356
- { (exit 1); exit 1; }; }
21357
+ as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
21360
# These three variables are undocumented and unsupported,
21361
@@ -1921,10 +2196,10 @@
21362
# OS/2's system install, which has a completely different semantic
21363
# ./install, which can be erroneously created by make from ./install.sh.
21364
# Reject install programs that cannot install multiple files.
21365
-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
21366
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
21367
$as_echo_n "checking for a BSD-compatible install... " >&6; }
21368
if test -z "$INSTALL"; then
21369
-if test "${ac_cv_path_install+set}" = set; then
21370
+if test "${ac_cv_path_install+set}" = set; then :
21371
$as_echo_n "(cached) " >&6
21373
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
21374
@@ -1932,11 +2207,11 @@
21377
test -z "$as_dir" && as_dir=.
21378
- # Account for people who put trailing slashes in PATH elements.
21380
- ./ | .// | /cC/* | \
21381
+ # Account for people who put trailing slashes in PATH elements.
21382
+case $as_dir/ in #((
21383
+ ./ | .// | /[cC]/* | \
21384
/etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
21385
- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
21386
+ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
21389
# OSF1 and SCO ODT 3.0 have their own names for install.
21390
@@ -1973,7 +2248,7 @@
21398
rm -rf conftest.one conftest.two conftest.dir
21399
@@ -1989,7 +2264,7 @@
21400
INSTALL=$ac_install_sh
21403
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
21404
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
21405
$as_echo "$INSTALL" >&6; }
21407
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
21408
@@ -2000,21 +2275,34 @@
21410
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
21412
-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
21413
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
21414
$as_echo_n "checking whether build environment is sane... " >&6; }
21417
echo timestamp > conftest.file
21418
+# Reject unsafe characters in $srcdir or the absolute working directory
21419
+# name. Accept space and tab only in the latter.
21423
+ *[\\\"\#\$\&\'\`$am_lf]*)
21424
+ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
21427
+ *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
21428
+ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
21431
# Do `set' in a subshell so we don't clobber the current shell's
21432
# arguments. Must try -L first in case configure is actually a
21433
# symlink; some systems play weird games with the mod time of symlinks
21434
# (eg FreeBSD returns the mod time of the symlink's containing
21437
- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
21438
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
21439
if test "$*" = "X"; then
21441
- set X `ls -t $srcdir/configure conftest.file`
21442
+ set X `ls -t "$srcdir/configure" conftest.file`
21444
rm -f conftest.file
21445
if test "$*" != "X $srcdir/configure conftest.file" \
21446
@@ -2024,11 +2312,8 @@
21447
# if, for instance, CONFIG_SHELL is bash and it inherits a
21448
# broken ls alias from the environment. This has actually
21449
# happened. Such a system could not be considered "sane".
21450
- { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
21451
-alias in your environment" >&5
21452
-$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
21453
-alias in your environment" >&2;}
21454
- { (exit 1); exit 1; }; }
21455
+ as_fn_error "ls -t appears to fail. Make sure there is not a broken
21456
+alias in your environment" "$LINENO" 5
21459
test "$2" = conftest.file
21460
@@ -2037,13 +2322,10 @@
21464
- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
21465
-Check your system clock" >&5
21466
-$as_echo "$as_me: error: newly created file is older than distributed files!
21467
-Check your system clock" >&2;}
21468
- { (exit 1); exit 1; }; }
21469
+ as_fn_error "newly created file is older than distributed files!
21470
+Check your system clock" "$LINENO" 5
21472
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
21473
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
21474
$as_echo "yes" >&6; }
21475
test "$program_prefix" != NONE &&
21476
program_transform_name="s&^&$program_prefix&;$program_transform_name"
21477
@@ -2058,40 +2340,156 @@
21478
# expand $ac_aux_dir to an absolute path
21479
am_aux_dir=`cd $ac_aux_dir && pwd`
21481
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
21482
+if test x"${MISSING+set}" != xset; then
21483
+ case $am_aux_dir in
21485
+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
21487
+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
21490
# Use eval to expand $SHELL
21491
if eval "$MISSING --run true"; then
21492
am_missing_run="$MISSING --run "
21495
- { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
21496
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
21497
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
21500
-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
21501
-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
21502
-if test -z "$MKDIR_P"; then
21503
- if test "${ac_cv_path_mkdir+set}" = set; then
21504
+if test x"${install_sh}" != xset; then
21505
+ case $am_aux_dir in
21507
+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
21509
+ install_sh="\${SHELL} $am_aux_dir/install-sh"
21513
+# Installed binaries are usually stripped using `strip' when the user
21514
+# run `make install-strip'. However `strip' might not be the right
21515
+# tool to use in cross-compilation environments, therefore Automake
21516
+# will honor the `STRIP' environment variable to overrule this program.
21517
+if test "$cross_compiling" != no; then
21518
+ if test -n "$ac_tool_prefix"; then
21519
+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
21520
+set dummy ${ac_tool_prefix}strip; ac_word=$2
21521
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
21522
+$as_echo_n "checking for $ac_word... " >&6; }
21523
+if test "${ac_cv_prog_STRIP+set}" = set; then :
21524
$as_echo_n "(cached) " >&6
21526
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
21527
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
21528
+ if test -n "$STRIP"; then
21529
+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
21531
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
21532
+for as_dir in $PATH
21535
test -z "$as_dir" && as_dir=.
21536
- for ac_prog in mkdir gmkdir; do
21537
- for ac_exec_ext in '' $ac_executable_extensions; do
21538
- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
21539
- case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
21540
- 'mkdir (GNU coreutils) '* | \
21541
- 'mkdir (coreutils) '* | \
21542
- 'mkdir (fileutils) '4.1*)
21543
- ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
21546
+ for ac_exec_ext in '' $ac_executable_extensions; do
21547
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
21548
+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
21549
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
21558
+STRIP=$ac_cv_prog_STRIP
21559
+if test -n "$STRIP"; then
21560
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
21561
+$as_echo "$STRIP" >&6; }
21563
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
21564
+$as_echo "no" >&6; }
21569
+if test -z "$ac_cv_prog_STRIP"; then
21570
+ ac_ct_STRIP=$STRIP
21571
+ # Extract the first word of "strip", so it can be a program name with args.
21572
+set dummy strip; ac_word=$2
21573
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
21574
+$as_echo_n "checking for $ac_word... " >&6; }
21575
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
21576
+ $as_echo_n "(cached) " >&6
21578
+ if test -n "$ac_ct_STRIP"; then
21579
+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
21581
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
21582
+for as_dir in $PATH
21585
+ test -z "$as_dir" && as_dir=.
21586
+ for ac_exec_ext in '' $ac_executable_extensions; do
21587
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
21588
+ ac_cv_prog_ac_ct_STRIP="strip"
21589
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
21598
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
21599
+if test -n "$ac_ct_STRIP"; then
21600
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
21601
+$as_echo "$ac_ct_STRIP" >&6; }
21603
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
21604
+$as_echo "no" >&6; }
21607
+ if test "x$ac_ct_STRIP" = x; then
21610
+ case $cross_compiling:$ac_tool_warned in
21612
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
21613
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
21614
+ac_tool_warned=yes ;;
21616
+ STRIP=$ac_ct_STRIP
21619
+ STRIP="$ac_cv_prog_STRIP"
21623
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
21625
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
21626
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
21627
+if test -z "$MKDIR_P"; then
21628
+ if test "${ac_cv_path_mkdir+set}" = set; then :
21629
+ $as_echo_n "(cached) " >&6
21631
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
21632
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
21635
+ test -z "$as_dir" && as_dir=.
21636
+ for ac_prog in mkdir gmkdir; do
21637
+ for ac_exec_ext in '' $ac_executable_extensions; do
21638
+ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
21639
+ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
21640
+ 'mkdir (GNU coreutils) '* | \
21641
+ 'mkdir (coreutils) '* | \
21642
+ 'mkdir (fileutils) '4.1*)
21643
+ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
21653
@@ -2107,7 +2505,7 @@
21654
MKDIR_P="$ac_install_sh -d"
21657
-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
21658
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
21659
$as_echo "$MKDIR_P" >&6; }
21662
@@ -2120,9 +2518,9 @@
21664
# Extract the first word of "$ac_prog", so it can be a program name with args.
21665
set dummy $ac_prog; ac_word=$2
21666
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
21667
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
21668
$as_echo_n "checking for $ac_word... " >&6; }
21669
-if test "${ac_cv_prog_AWK+set}" = set; then
21670
+if test "${ac_cv_prog_AWK+set}" = set; then :
21671
$as_echo_n "(cached) " >&6
21673
if test -n "$AWK"; then
21674
@@ -2133,24 +2531,24 @@
21677
test -z "$as_dir" && as_dir=.
21678
- for ac_exec_ext in '' $ac_executable_extensions; do
21679
+ for ac_exec_ext in '' $ac_executable_extensions; do
21680
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
21681
ac_cv_prog_AWK="$ac_prog"
21682
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
21683
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
21693
AWK=$ac_cv_prog_AWK
21694
if test -n "$AWK"; then
21695
- { $as_echo "$as_me:$LINENO: result: $AWK" >&5
21696
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
21697
$as_echo "$AWK" >&6; }
21699
- { $as_echo "$as_me:$LINENO: result: no" >&5
21700
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
21701
$as_echo "no" >&6; }
21704
@@ -2158,11 +2556,11 @@
21705
test -n "$AWK" && break
21708
-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
21709
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
21710
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
21712
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
21713
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
21714
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
21715
$as_echo_n "(cached) " >&6
21717
cat >conftest.make <<\_ACEOF
21718
@@ -2180,11 +2578,11 @@
21719
rm -f conftest.make
21721
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
21722
- { $as_echo "$as_me:$LINENO: result: yes" >&5
21723
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
21724
$as_echo "yes" >&6; }
21727
- { $as_echo "$as_me:$LINENO: result: no" >&5
21728
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
21729
$as_echo "no" >&6; }
21730
SET_MAKE="MAKE=${MAKE-make}"
21732
@@ -2204,9 +2602,7 @@
21733
am__isrc=' -I$(srcdir)'
21734
# test to see if srcdir already configured
21735
if test -f $srcdir/config.status; then
21736
- { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
21737
-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
21738
- { (exit 1); exit 1; }; }
21739
+ as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
21743
@@ -2250,108 +2646,6 @@
21745
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
21747
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
21749
-# Installed binaries are usually stripped using `strip' when the user
21750
-# run `make install-strip'. However `strip' might not be the right
21751
-# tool to use in cross-compilation environments, therefore Automake
21752
-# will honor the `STRIP' environment variable to overrule this program.
21753
-if test "$cross_compiling" != no; then
21754
- if test -n "$ac_tool_prefix"; then
21755
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
21756
-set dummy ${ac_tool_prefix}strip; ac_word=$2
21757
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
21758
-$as_echo_n "checking for $ac_word... " >&6; }
21759
-if test "${ac_cv_prog_STRIP+set}" = set; then
21760
- $as_echo_n "(cached) " >&6
21762
- if test -n "$STRIP"; then
21763
- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
21765
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
21766
-for as_dir in $PATH
21769
- test -z "$as_dir" && as_dir=.
21770
- for ac_exec_ext in '' $ac_executable_extensions; do
21771
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
21772
- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
21773
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
21782
-STRIP=$ac_cv_prog_STRIP
21783
-if test -n "$STRIP"; then
21784
- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
21785
-$as_echo "$STRIP" >&6; }
21787
- { $as_echo "$as_me:$LINENO: result: no" >&5
21788
-$as_echo "no" >&6; }
21793
-if test -z "$ac_cv_prog_STRIP"; then
21794
- ac_ct_STRIP=$STRIP
21795
- # Extract the first word of "strip", so it can be a program name with args.
21796
-set dummy strip; ac_word=$2
21797
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
21798
-$as_echo_n "checking for $ac_word... " >&6; }
21799
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
21800
- $as_echo_n "(cached) " >&6
21802
- if test -n "$ac_ct_STRIP"; then
21803
- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
21805
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
21806
-for as_dir in $PATH
21809
- test -z "$as_dir" && as_dir=.
21810
- for ac_exec_ext in '' $ac_executable_extensions; do
21811
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
21812
- ac_cv_prog_ac_ct_STRIP="strip"
21813
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
21822
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
21823
-if test -n "$ac_ct_STRIP"; then
21824
- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
21825
-$as_echo "$ac_ct_STRIP" >&6; }
21827
- { $as_echo "$as_me:$LINENO: result: no" >&5
21828
-$as_echo "no" >&6; }
21831
- if test "x$ac_ct_STRIP" = x; then
21834
- case $cross_compiling:$ac_tool_warned in
21836
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
21837
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
21838
-ac_tool_warned=yes ;;
312
+ rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
317
+ '"s|^| $ac_top_srcdir/|" \
318
+ "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
320
+ [sed '/^POTFILES =/,/[^\\]$/ {
324
+ ' "$1/Makefile.in" >"$1/Makefile"]
325
+ rm -f "$1/Makefile.tmp"
326
+ mv "$1/stamp-it.tmp" "$1/stamp-it"
331
+# _IT_SUBST(VARIABLE)
332
+# -------------------
333
+# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
335
+AC_DEFUN([_IT_SUBST],
338
+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
343
+AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
344
+# A hint is needed for aclocal from Automake <= 1.9.4:
345
+# AC_DEFUN([AC_PROG_INTLTOOL], ...)
348
# nls.m4 serial 3 (gettext-0.15)
349
dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
350
dnl This file is free software; the Free Software Foundation
351
@@ -1589,197 +1783,3 @@
352
AC_SUBST([am__untar])
356
-dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
357
-# serial 40 IT_PROG_INTLTOOL
358
-AC_DEFUN([IT_PROG_INTLTOOL], [
359
-AC_PREREQ([2.50])dnl
360
-AC_REQUIRE([AM_NLS])dnl
362
-case "$am__api_version" in
364
- AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
21840
- STRIP=$ac_ct_STRIP
370
-if test -n "$1"; then
371
- AC_MSG_CHECKING([for intltool >= $1])
373
- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
374
- INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
375
- [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
377
- AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
378
- test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
379
- AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.])
382
-AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
383
-AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
384
-AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
385
-if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
386
- AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
389
- INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
390
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
391
- INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
392
- INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
393
- INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
394
- INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
395
- INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
396
- INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
397
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
398
- INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
399
- INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
400
- INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@'
401
- INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
402
- INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
403
- INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
404
- INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
405
- INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
406
- INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
407
- INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
409
-_IT_SUBST(INTLTOOL_DESKTOP_RULE)
410
-_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
411
-_IT_SUBST(INTLTOOL_KEYS_RULE)
412
-_IT_SUBST(INTLTOOL_PROP_RULE)
413
-_IT_SUBST(INTLTOOL_OAF_RULE)
414
-_IT_SUBST(INTLTOOL_PONG_RULE)
415
-_IT_SUBST(INTLTOOL_SERVER_RULE)
416
-_IT_SUBST(INTLTOOL_SHEET_RULE)
417
-_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
418
-_IT_SUBST(INTLTOOL_UI_RULE)
419
-_IT_SUBST(INTLTOOL_XAM_RULE)
420
-_IT_SUBST(INTLTOOL_KBD_RULE)
421
-_IT_SUBST(INTLTOOL_XML_RULE)
422
-_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
423
-_IT_SUBST(INTLTOOL_CAVES_RULE)
424
-_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
425
-_IT_SUBST(INTLTOOL_THEME_RULE)
426
-_IT_SUBST(INTLTOOL_SERVICE_RULE)
427
-_IT_SUBST(INTLTOOL_POLICY_RULE)
429
-# Check the gettext tools to make sure they are GNU
430
-AC_PATH_PROG(XGETTEXT, xgettext)
431
-AC_PATH_PROG(MSGMERGE, msgmerge)
432
-AC_PATH_PROG(MSGFMT, msgfmt)
433
-AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
434
-if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
435
- AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
437
-xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
438
-mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
439
-mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
440
-if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
441
- AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
444
-AC_PATH_PROG(INTLTOOL_PERL, perl)
445
-if test -z "$INTLTOOL_PERL"; then
446
- AC_MSG_ERROR([perl not found])
448
-AC_MSG_CHECKING([for perl >= 5.8.1])
449
-$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
450
-if test $? -ne 0; then
451
- AC_MSG_ERROR([perl 5.8.1 is required for intltool])
21843
- STRIP="$ac_cv_prog_STRIP"
21847
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
21849
# We need awk for the "check" target. The system "awk" is bad on
21851
# Always define AMTAR for backward compatibility.
21852
@@ -2359,7 +2653,7 @@
21853
AMTAR=${AMTAR-"${am_missing_run}tar"}
21856
-{ $as_echo "$as_me:$LINENO: checking how to create a ustar tar archive" >&5
21857
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
21858
$as_echo_n "checking how to create a ustar tar archive... " >&6; }
21859
# Loop over all known methods to create a tar archive until one works.
21860
_am_tools='gnutar plaintar pax cpio none'
21861
@@ -2432,13 +2726,13 @@
21863
rm -rf conftest.dir
21865
-if test "${am_cv_prog_tar_ustar+set}" = set; then
21866
+if test "${am_cv_prog_tar_ustar+set}" = set; then :
21867
$as_echo_n "(cached) " >&6
21869
am_cv_prog_tar_ustar=$_am_tool
21872
-{ $as_echo "$as_me:$LINENO: result: $am_cv_prog_tar_ustar" >&5
21873
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
21874
$as_echo "$am_cv_prog_tar_ustar" >&6; }
21877
@@ -2447,16 +2741,16 @@
21881
- { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5
21882
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
21883
$as_echo_n "checking whether NLS is requested... " >&6; }
21884
# Check whether --enable-nls was given.
21885
-if test "${enable_nls+set}" = set; then
21886
+if test "${enable_nls+set}" = set; then :
21887
enableval=$enable_nls; USE_NLS=$enableval
21892
- { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5
21893
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
21894
$as_echo "$USE_NLS" >&6; }
21897
@@ -2468,44 +2762,44 @@
21898
am_make=${MAKE-make}
21899
cat > confinc << 'END'
21902
+ @echo this is the am__doit target
21905
# If we don't find an include directive, just comment out the code.
21906
-{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
21907
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
21908
$as_echo_n "checking for style of include used by $am_make... " >&6; }
21912
# First try GNU make style include.
21913
echo "include confinc" > confmf
21914
-# We grep out `Entering directory' and `Leaving directory'
21915
-# messages which can occur if `w' ends up in MAKEFLAGS.
21916
-# In particular we don't look at `^make:' because GNU make might
21917
-# be invoked under some other name (usually "gmake"), in which
21918
-# case it prints its new name instead of `make'.
21919
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
21920
- am__include=include
21924
+# Ignore all kinds of additional output from `make'.
21925
+case `$am_make -s -f confmf 2> /dev/null` in #(
21926
+*the\ am__doit\ target*)
21927
+ am__include=include
21932
# Now try BSD make style include.
21933
if test "$am__include" = "#"; then
21934
echo '.include "confinc"' > confmf
21935
- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
21936
- am__include=.include
453
- IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
454
- AC_MSG_RESULT([$IT_PERL_VERSION])
456
-if test "x$2" != "xno-xml"; then
457
- AC_MSG_CHECKING([for XML::Parser])
458
- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
459
- AC_MSG_RESULT([ok])
461
- AC_MSG_ERROR([XML::Parser perl module is required for intltool])
21940
+ case `$am_make -s -f confmf 2> /dev/null` in #(
21941
+ *the\ am__doit\ target*)
21942
+ am__include=.include
21950
-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
21951
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
21952
$as_echo "$_am_result" >&6; }
21953
rm -f confinc confmf
21955
# Check whether --enable-dependency-tracking was given.
21956
-if test "${enable_dependency_tracking+set}" = set; then
21957
+if test "${enable_dependency_tracking+set}" = set; then :
21958
enableval=$enable_dependency_tracking;
21961
@@ -2530,9 +2824,9 @@
21962
if test -n "$ac_tool_prefix"; then
21963
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
21964
set dummy ${ac_tool_prefix}gcc; ac_word=$2
21965
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
21966
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
21967
$as_echo_n "checking for $ac_word... " >&6; }
21968
-if test "${ac_cv_prog_CC+set}" = set; then
21969
+if test "${ac_cv_prog_CC+set}" = set; then :
21970
$as_echo_n "(cached) " >&6
21972
if test -n "$CC"; then
21973
@@ -2543,24 +2837,24 @@
21976
test -z "$as_dir" && as_dir=.
21977
- for ac_exec_ext in '' $ac_executable_extensions; do
21978
+ for ac_exec_ext in '' $ac_executable_extensions; do
21979
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
21980
ac_cv_prog_CC="${ac_tool_prefix}gcc"
21981
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
21982
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
21993
if test -n "$CC"; then
21994
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
21995
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
21996
$as_echo "$CC" >&6; }
21998
- { $as_echo "$as_me:$LINENO: result: no" >&5
21999
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
22000
$as_echo "no" >&6; }
22003
@@ -2570,9 +2864,9 @@
22005
# Extract the first word of "gcc", so it can be a program name with args.
22006
set dummy gcc; ac_word=$2
22007
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
22008
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
22009
$as_echo_n "checking for $ac_word... " >&6; }
22010
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
22011
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
22012
$as_echo_n "(cached) " >&6
22014
if test -n "$ac_ct_CC"; then
22015
@@ -2583,24 +2877,24 @@
22018
test -z "$as_dir" && as_dir=.
22019
- for ac_exec_ext in '' $ac_executable_extensions; do
22020
+ for ac_exec_ext in '' $ac_executable_extensions; do
22021
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
22022
ac_cv_prog_ac_ct_CC="gcc"
22023
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
22024
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
22034
ac_ct_CC=$ac_cv_prog_ac_ct_CC
22035
if test -n "$ac_ct_CC"; then
22036
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
22037
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
22038
$as_echo "$ac_ct_CC" >&6; }
22040
- { $as_echo "$as_me:$LINENO: result: no" >&5
22041
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
22042
$as_echo "no" >&6; }
22045
@@ -2609,7 +2903,7 @@
22047
case $cross_compiling:$ac_tool_warned in
22049
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
22050
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
22051
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
22052
ac_tool_warned=yes ;;
22054
@@ -2623,9 +2917,9 @@
22055
if test -n "$ac_tool_prefix"; then
22056
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
22057
set dummy ${ac_tool_prefix}cc; ac_word=$2
22058
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
22059
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
22060
$as_echo_n "checking for $ac_word... " >&6; }
22061
-if test "${ac_cv_prog_CC+set}" = set; then
22062
+if test "${ac_cv_prog_CC+set}" = set; then :
22063
$as_echo_n "(cached) " >&6
22065
if test -n "$CC"; then
22066
@@ -2636,24 +2930,24 @@
22069
test -z "$as_dir" && as_dir=.
22070
- for ac_exec_ext in '' $ac_executable_extensions; do
22071
+ for ac_exec_ext in '' $ac_executable_extensions; do
22072
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
22073
ac_cv_prog_CC="${ac_tool_prefix}cc"
22074
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
22075
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
22086
if test -n "$CC"; then
22087
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
22088
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
22089
$as_echo "$CC" >&6; }
22091
- { $as_echo "$as_me:$LINENO: result: no" >&5
22092
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
22093
$as_echo "no" >&6; }
22096
@@ -2663,9 +2957,9 @@
22097
if test -z "$CC"; then
22098
# Extract the first word of "cc", so it can be a program name with args.
22099
set dummy cc; ac_word=$2
22100
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
22101
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
22102
$as_echo_n "checking for $ac_word... " >&6; }
22103
-if test "${ac_cv_prog_CC+set}" = set; then
22104
+if test "${ac_cv_prog_CC+set}" = set; then :
22105
$as_echo_n "(cached) " >&6
22107
if test -n "$CC"; then
22108
@@ -2677,18 +2971,18 @@
22111
test -z "$as_dir" && as_dir=.
22112
- for ac_exec_ext in '' $ac_executable_extensions; do
22113
+ for ac_exec_ext in '' $ac_executable_extensions; do
22114
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
22115
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
22116
ac_prog_rejected=yes
22120
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
22121
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
22129
if test $ac_prog_rejected = yes; then
22130
@@ -2707,10 +3001,10 @@
22133
if test -n "$CC"; then
22134
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
22135
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
22136
$as_echo "$CC" >&6; }
22138
- { $as_echo "$as_me:$LINENO: result: no" >&5
22139
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
22140
$as_echo "no" >&6; }
22143
@@ -2722,9 +3016,9 @@
22145
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
22146
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
22147
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
22148
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
22149
$as_echo_n "checking for $ac_word... " >&6; }
22150
-if test "${ac_cv_prog_CC+set}" = set; then
22151
+if test "${ac_cv_prog_CC+set}" = set; then :
22152
$as_echo_n "(cached) " >&6
22154
if test -n "$CC"; then
22155
@@ -2735,24 +3029,24 @@
22158
test -z "$as_dir" && as_dir=.
22159
- for ac_exec_ext in '' $ac_executable_extensions; do
22160
+ for ac_exec_ext in '' $ac_executable_extensions; do
22161
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
22162
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
22163
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
22164
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
22175
if test -n "$CC"; then
22176
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
22177
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
22178
$as_echo "$CC" >&6; }
22180
- { $as_echo "$as_me:$LINENO: result: no" >&5
22181
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
22182
$as_echo "no" >&6; }
22185
@@ -2766,9 +3060,9 @@
22187
# Extract the first word of "$ac_prog", so it can be a program name with args.
22188
set dummy $ac_prog; ac_word=$2
22189
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
22190
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
22191
$as_echo_n "checking for $ac_word... " >&6; }
22192
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
22193
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
22194
$as_echo_n "(cached) " >&6
22196
if test -n "$ac_ct_CC"; then
22197
@@ -2779,24 +3073,24 @@
22200
test -z "$as_dir" && as_dir=.
22201
- for ac_exec_ext in '' $ac_executable_extensions; do
22202
+ for ac_exec_ext in '' $ac_executable_extensions; do
22203
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
22204
ac_cv_prog_ac_ct_CC="$ac_prog"
22205
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
22206
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
22216
ac_ct_CC=$ac_cv_prog_ac_ct_CC
22217
if test -n "$ac_ct_CC"; then
22218
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
22219
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
22220
$as_echo "$ac_ct_CC" >&6; }
22222
- { $as_echo "$as_me:$LINENO: result: no" >&5
22223
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
22224
$as_echo "no" >&6; }
22227
@@ -2809,7 +3103,7 @@
22229
case $cross_compiling:$ac_tool_warned in
22231
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
22232
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
22233
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
22234
ac_tool_warned=yes ;;
22236
@@ -2820,73 +3114,55 @@
22240
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
22241
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
22242
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
22243
-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
22244
-See \`config.log' for more details." >&5
22245
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
22246
-See \`config.log' for more details." >&2;}
22247
- { (exit 1); exit 1; }; }; }
22248
+as_fn_error "no acceptable C compiler found in \$PATH
22249
+See \`config.log' for more details." "$LINENO" 5; }
22251
# Provide some information about the compiler.
22252
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
22253
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
22256
-{ (ac_try="$ac_compiler --version >&5"
22257
-case "(($ac_try" in
22258
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
22259
- *) ac_try_echo=$ac_try;;
22261
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
22262
-$as_echo "$ac_try_echo") >&5
22263
- (eval "$ac_compiler --version >&5") 2>&5
22265
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
22266
- (exit $ac_status); }
22267
-{ (ac_try="$ac_compiler -v >&5"
22268
-case "(($ac_try" in
22269
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
22270
- *) ac_try_echo=$ac_try;;
22272
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
22273
-$as_echo "$ac_try_echo") >&5
22274
- (eval "$ac_compiler -v >&5") 2>&5
22276
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
22277
- (exit $ac_status); }
22278
-{ (ac_try="$ac_compiler -V >&5"
22279
+for ac_option in --version -v -V -qversion; do
22280
+ { { ac_try="$ac_compiler $ac_option >&5"
22281
case "(($ac_try" in
22282
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
22283
*) ac_try_echo=$ac_try;;
22285
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
22286
-$as_echo "$ac_try_echo") >&5
22287
- (eval "$ac_compiler -V >&5") 2>&5
22289
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
22290
- (exit $ac_status); }
22291
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
22292
+$as_echo "$ac_try_echo"; } >&5
22293
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
22295
+ if test -s conftest.err; then
22297
+... rest of stderr output deleted ...
22298
+ 10q' conftest.err >conftest.er1
22299
+ cat conftest.er1 >&5
22300
+ rm -f conftest.er1 conftest.err
22302
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
22303
+ test $ac_status = 0; }
22306
-cat >conftest.$ac_ext <<_ACEOF
22309
-cat confdefs.h >>conftest.$ac_ext
22310
-cat >>conftest.$ac_ext <<_ACEOF
22311
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
22312
/* end confdefs.h. */
22314
+#include <stdio.h>
22318
+FILE *f = fopen ("conftest.out", "w");
22319
+ return ferror (f) || fclose (f) != 0;
22325
ac_clean_files_save=$ac_clean_files
22326
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
22327
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
22328
# Try to create an executable without -o first, disregard a.out.
22329
# It will help us diagnose broken compilers, and finding out an intuition
22331
-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
22332
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
22333
$as_echo_n "checking for C compiler default output file name... " >&6; }
22334
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
22336
@@ -2903,17 +3179,17 @@
22340
-if { (ac_try="$ac_link_default"
22341
+if { { ac_try="$ac_link_default"
22342
case "(($ac_try" in
22343
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
22344
*) ac_try_echo=$ac_try;;
22346
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
22347
-$as_echo "$ac_try_echo") >&5
22348
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
22349
+$as_echo "$ac_try_echo"; } >&5
22350
(eval "$ac_link_default") 2>&5
22352
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
22353
- (exit $ac_status); }; then
22354
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
22355
+ test $ac_status = 0; }; then :
22356
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
22357
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
22358
# in a Makefile. We should not override ac_cv_exeext if it was cached,
22359
@@ -2930,7 +3206,7 @@
22363
- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
22364
+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
22366
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
22368
@@ -2949,84 +3225,75 @@
22373
-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
22374
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
22375
$as_echo "$ac_file" >&6; }
22376
-if test -z "$ac_file"; then
22377
+if test -z "$ac_file"; then :
22378
$as_echo "$as_me: failed program was:" >&5
22379
sed 's/^/| /' conftest.$ac_ext >&5
22381
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
22382
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
22383
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
22384
-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
22385
-See \`config.log' for more details." >&5
22386
-$as_echo "$as_me: error: C compiler cannot create executables
22387
-See \`config.log' for more details." >&2;}
22388
- { (exit 77); exit 77; }; }; }
22389
+{ as_fn_set_status 77
22390
+as_fn_error "C compiler cannot create executables
22391
+See \`config.log' for more details." "$LINENO" 5; }; }
22394
ac_exeext=$ac_cv_exeext
22396
# Check that the compiler produces executables we can run. If not, either
22397
# the compiler is broken, or we cross compile.
22398
-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
22399
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
22400
$as_echo_n "checking whether the C compiler works... " >&6; }
22401
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
22402
# If not cross compiling, check that we can run a simple program.
22403
if test "$cross_compiling" != yes; then
22404
if { ac_try='./$ac_file'
22405
- { (case "(($ac_try" in
22406
+ { { case "(($ac_try" in
22407
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
22408
*) ac_try_echo=$ac_try;;
22410
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
22411
-$as_echo "$ac_try_echo") >&5
22412
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
22413
+$as_echo "$ac_try_echo"; } >&5
22414
(eval "$ac_try") 2>&5
22416
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
22417
- (exit $ac_status); }; }; then
22418
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
22419
+ test $ac_status = 0; }; }; then
22422
if test "$cross_compiling" = maybe; then
22423
cross_compiling=yes
22425
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
22426
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
22427
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
22428
-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
22429
-If you meant to cross compile, use \`--host'.
22430
-See \`config.log' for more details." >&5
22431
-$as_echo "$as_me: error: cannot run C compiled programs.
22432
+as_fn_error "cannot run C compiled programs.
22433
If you meant to cross compile, use \`--host'.
22434
-See \`config.log' for more details." >&2;}
22435
- { (exit 1); exit 1; }; }; }
22436
+See \`config.log' for more details." "$LINENO" 5; }
22440
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
22441
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
22442
$as_echo "yes" >&6; }
22444
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
22445
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
22446
ac_clean_files=$ac_clean_files_save
22447
# Check that the compiler produces executables we can run. If not, either
22448
# the compiler is broken, or we cross compile.
22449
-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
22450
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
22451
$as_echo_n "checking whether we are cross compiling... " >&6; }
22452
-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
22453
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
22454
$as_echo "$cross_compiling" >&6; }
22456
-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
22457
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
22458
$as_echo_n "checking for suffix of executables... " >&6; }
22459
-if { (ac_try="$ac_link"
22460
+if { { ac_try="$ac_link"
22461
case "(($ac_try" in
22462
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
22463
*) ac_try_echo=$ac_try;;
22465
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
22466
-$as_echo "$ac_try_echo") >&5
22467
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
22468
+$as_echo "$ac_try_echo"; } >&5
22469
(eval "$ac_link") 2>&5
22471
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
22472
- (exit $ac_status); }; then
22473
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
22474
+ test $ac_status = 0; }; then :
22475
# If both `conftest.exe' and `conftest' are `present' (well, observable)
22476
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
22477
# work properly (i.e., refer to `conftest.exe'), while it won't with
22478
@@ -3041,32 +3308,24 @@
22482
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
22483
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
22484
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
22485
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
22486
-See \`config.log' for more details." >&5
22487
-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
22488
-See \`config.log' for more details." >&2;}
22489
- { (exit 1); exit 1; }; }; }
22490
+as_fn_error "cannot compute suffix of executables: cannot compile and link
22491
+See \`config.log' for more details." "$LINENO" 5; }
22494
rm -f conftest$ac_cv_exeext
22495
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
22496
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
22497
$as_echo "$ac_cv_exeext" >&6; }
22499
rm -f conftest.$ac_ext
22500
EXEEXT=$ac_cv_exeext
22502
-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
22503
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
22504
$as_echo_n "checking for suffix of object files... " >&6; }
22505
-if test "${ac_cv_objext+set}" = set; then
22506
+if test "${ac_cv_objext+set}" = set; then :
22507
$as_echo_n "(cached) " >&6
22509
- cat >conftest.$ac_ext <<_ACEOF
22512
-cat confdefs.h >>conftest.$ac_ext
22513
-cat >>conftest.$ac_ext <<_ACEOF
22514
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
22515
/* end confdefs.h. */
22518
@@ -3078,17 +3337,17 @@
22521
rm -f conftest.o conftest.obj
22522
-if { (ac_try="$ac_compile"
22523
+if { { ac_try="$ac_compile"
22524
case "(($ac_try" in
22525
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
22526
*) ac_try_echo=$ac_try;;
22528
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
22529
-$as_echo "$ac_try_echo") >&5
22530
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
22531
+$as_echo "$ac_try_echo"; } >&5
22532
(eval "$ac_compile") 2>&5
22534
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
22535
- (exit $ac_status); }; then
22536
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
22537
+ test $ac_status = 0; }; then :
22538
for ac_file in conftest.o conftest.obj conftest.*; do
22539
test -f "$ac_file" || continue;
22541
@@ -3101,31 +3360,23 @@
22542
$as_echo "$as_me: failed program was:" >&5
22543
sed 's/^/| /' conftest.$ac_ext >&5
22545
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
22546
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
22547
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
22548
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
22549
-See \`config.log' for more details." >&5
22550
-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
22551
-See \`config.log' for more details." >&2;}
22552
- { (exit 1); exit 1; }; }; }
22553
+as_fn_error "cannot compute suffix of object files: cannot compile
22554
+See \`config.log' for more details." "$LINENO" 5; }
22557
rm -f conftest.$ac_cv_objext conftest.$ac_ext
22559
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
22560
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
22561
$as_echo "$ac_cv_objext" >&6; }
22562
OBJEXT=$ac_cv_objext
22564
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
22565
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
22566
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
22567
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
22568
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
22569
$as_echo_n "(cached) " >&6
22571
- cat >conftest.$ac_ext <<_ACEOF
22574
-cat confdefs.h >>conftest.$ac_ext
22575
-cat >>conftest.$ac_ext <<_ACEOF
22576
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
22577
/* end confdefs.h. */
22580
@@ -3139,37 +3390,16 @@
22584
-rm -f conftest.$ac_objext
22585
-if { (ac_try="$ac_compile"
22586
-case "(($ac_try" in
22587
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
22588
- *) ac_try_echo=$ac_try;;
22590
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
22591
-$as_echo "$ac_try_echo") >&5
22592
- (eval "$ac_compile") 2>conftest.er1
22594
- grep -v '^ *+' conftest.er1 >conftest.err
22595
- rm -f conftest.er1
22596
- cat conftest.err >&5
22597
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
22598
- (exit $ac_status); } && {
22599
- test -z "$ac_c_werror_flag" ||
22600
- test ! -s conftest.err
22601
- } && test -s conftest.$ac_objext; then
22602
+if ac_fn_c_try_compile "$LINENO"; then :
22603
ac_compiler_gnu=yes
22605
- $as_echo "$as_me: failed program was:" >&5
22606
-sed 's/^/| /' conftest.$ac_ext >&5
22608
- ac_compiler_gnu=no
22609
+ ac_compiler_gnu=no
22612
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
22613
ac_cv_c_compiler_gnu=$ac_compiler_gnu
22616
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
22617
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
22618
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
22619
if test $ac_compiler_gnu = yes; then
22621
@@ -3178,20 +3408,16 @@
22623
ac_test_CFLAGS=${CFLAGS+set}
22624
ac_save_CFLAGS=$CFLAGS
22625
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
22626
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
22627
$as_echo_n "checking whether $CC accepts -g... " >&6; }
22628
-if test "${ac_cv_prog_cc_g+set}" = set; then
22629
+if test "${ac_cv_prog_cc_g+set}" = set; then :
22630
$as_echo_n "(cached) " >&6
22632
ac_save_c_werror_flag=$ac_c_werror_flag
22633
ac_c_werror_flag=yes
22636
- cat >conftest.$ac_ext <<_ACEOF
22639
-cat confdefs.h >>conftest.$ac_ext
22640
-cat >>conftest.$ac_ext <<_ACEOF
22641
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
22642
/* end confdefs.h. */
22645
@@ -3202,35 +3428,11 @@
22649
-rm -f conftest.$ac_objext
22650
-if { (ac_try="$ac_compile"
22651
-case "(($ac_try" in
22652
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
22653
- *) ac_try_echo=$ac_try;;
22655
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
22656
-$as_echo "$ac_try_echo") >&5
22657
- (eval "$ac_compile") 2>conftest.er1
22659
- grep -v '^ *+' conftest.er1 >conftest.err
22660
- rm -f conftest.er1
22661
- cat conftest.err >&5
22662
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
22663
- (exit $ac_status); } && {
22664
- test -z "$ac_c_werror_flag" ||
22665
- test ! -s conftest.err
22666
- } && test -s conftest.$ac_objext; then
22667
+if ac_fn_c_try_compile "$LINENO"; then :
22668
ac_cv_prog_cc_g=yes
22670
- $as_echo "$as_me: failed program was:" >&5
22671
-sed 's/^/| /' conftest.$ac_ext >&5
22674
- cat >conftest.$ac_ext <<_ACEOF
22677
-cat confdefs.h >>conftest.$ac_ext
22678
-cat >>conftest.$ac_ext <<_ACEOF
22680
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
22681
/* end confdefs.h. */
22684
@@ -3241,36 +3443,12 @@
22688
-rm -f conftest.$ac_objext
22689
-if { (ac_try="$ac_compile"
22690
-case "(($ac_try" in
22691
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
22692
- *) ac_try_echo=$ac_try;;
22694
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
22695
-$as_echo "$ac_try_echo") >&5
22696
- (eval "$ac_compile") 2>conftest.er1
22698
- grep -v '^ *+' conftest.er1 >conftest.err
22699
- rm -f conftest.er1
22700
- cat conftest.err >&5
22701
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
22702
- (exit $ac_status); } && {
22703
- test -z "$ac_c_werror_flag" ||
22704
- test ! -s conftest.err
22705
- } && test -s conftest.$ac_objext; then
22708
- $as_echo "$as_me: failed program was:" >&5
22709
-sed 's/^/| /' conftest.$ac_ext >&5
22710
+if ac_fn_c_try_compile "$LINENO"; then :
22712
- ac_c_werror_flag=$ac_save_c_werror_flag
22714
+ ac_c_werror_flag=$ac_save_c_werror_flag
22716
- cat >conftest.$ac_ext <<_ACEOF
22719
-cat confdefs.h >>conftest.$ac_ext
22720
-cat >>conftest.$ac_ext <<_ACEOF
22721
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
22722
/* end confdefs.h. */
22725
@@ -3281,42 +3459,17 @@
22729
-rm -f conftest.$ac_objext
22730
-if { (ac_try="$ac_compile"
22731
-case "(($ac_try" in
22732
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
22733
- *) ac_try_echo=$ac_try;;
22735
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
22736
-$as_echo "$ac_try_echo") >&5
22737
- (eval "$ac_compile") 2>conftest.er1
22739
- grep -v '^ *+' conftest.er1 >conftest.err
22740
- rm -f conftest.er1
22741
- cat conftest.err >&5
22742
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
22743
- (exit $ac_status); } && {
22744
- test -z "$ac_c_werror_flag" ||
22745
- test ! -s conftest.err
22746
- } && test -s conftest.$ac_objext; then
22747
+if ac_fn_c_try_compile "$LINENO"; then :
22748
ac_cv_prog_cc_g=yes
22750
- $as_echo "$as_me: failed program was:" >&5
22751
-sed 's/^/| /' conftest.$ac_ext >&5
22756
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
22759
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
22762
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
22763
ac_c_werror_flag=$ac_save_c_werror_flag
22765
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
22766
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
22767
$as_echo "$ac_cv_prog_cc_g" >&6; }
22768
if test "$ac_test_CFLAGS" = set; then
22769
CFLAGS=$ac_save_CFLAGS
22770
@@ -3333,18 +3486,14 @@
22774
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
22775
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
22776
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
22777
-if test "${ac_cv_prog_cc_c89+set}" = set; then
22778
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
22779
$as_echo_n "(cached) " >&6
22781
ac_cv_prog_cc_c89=no
22783
-cat >conftest.$ac_ext <<_ACEOF
22786
-cat confdefs.h >>conftest.$ac_ext
22787
-cat >>conftest.$ac_ext <<_ACEOF
22788
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
22789
/* end confdefs.h. */
22790
#include <stdarg.h>
22792
@@ -3401,32 +3550,9 @@
22793
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
22795
CC="$ac_save_CC $ac_arg"
22796
- rm -f conftest.$ac_objext
22797
-if { (ac_try="$ac_compile"
22798
-case "(($ac_try" in
22799
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
22800
- *) ac_try_echo=$ac_try;;
22802
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
22803
-$as_echo "$ac_try_echo") >&5
22804
- (eval "$ac_compile") 2>conftest.er1
22806
- grep -v '^ *+' conftest.er1 >conftest.err
22807
- rm -f conftest.er1
22808
- cat conftest.err >&5
22809
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
22810
- (exit $ac_status); } && {
22811
- test -z "$ac_c_werror_flag" ||
22812
- test ! -s conftest.err
22813
- } && test -s conftest.$ac_objext; then
22814
+ if ac_fn_c_try_compile "$LINENO"; then :
22815
ac_cv_prog_cc_c89=$ac_arg
22817
- $as_echo "$as_me: failed program was:" >&5
22818
-sed 's/^/| /' conftest.$ac_ext >&5
22823
rm -f core conftest.err conftest.$ac_objext
22824
test "x$ac_cv_prog_cc_c89" != "xno" && break
22826
@@ -3437,17 +3563,19 @@
22828
case "x$ac_cv_prog_cc_c89" in
22830
- { $as_echo "$as_me:$LINENO: result: none needed" >&5
22831
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
22832
$as_echo "none needed" >&6; } ;;
22834
- { $as_echo "$as_me:$LINENO: result: unsupported" >&5
22835
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
22836
$as_echo "unsupported" >&6; } ;;
22838
CC="$CC $ac_cv_prog_cc_c89"
22839
- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
22840
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
22841
$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
22843
+if test "x$ac_cv_prog_cc_c89" != xno; then :
22848
ac_cpp='$CPP $CPPFLAGS'
22849
@@ -3457,9 +3585,9 @@
22851
depcc="$CC" am_compiler_list=
22853
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
22854
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
22855
$as_echo_n "checking dependency style of $depcc... " >&6; }
22856
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
22857
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
22858
$as_echo_n "(cached) " >&6
22860
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
22861
@@ -3485,6 +3613,11 @@
22862
if test "$am_compiler_list" = ""; then
22863
am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
22865
+ am__universal=false
22866
+ case " $depcc " in #(
22867
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
22870
for depmode in $am_compiler_list; do
22871
# Setup a source with many dependencies, because some compilers
22872
# like to wrap large dependency lists on column 80 (with \), and
22873
@@ -3502,7 +3635,17 @@
22875
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
22877
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
22878
+ # mode. It turns out that the SunPro C++ compiler does not properly
22879
+ # handle `-M -o', and we need to detect this. Also, some Intel
22880
+ # versions had trouble with output in subdirs
22881
+ am__obj=sub/conftest.${OBJEXT-o}
22882
+ am__minus_obj="-o $am__obj"
22885
+ # This depmode causes a compiler race in universal mode.
22886
+ test "$am__universal" = false || continue
22889
# after this tag, mechanisms are not by side-effect, so they'll
22890
# only be used when explicitly requested
22891
@@ -3512,19 +3655,23 @@
22895
+ msvisualcpp | msvcmsys)
22896
+ # This compiler won't grok `-c -o', but also, the minuso test has
22897
+ # not run yet. These depmodes are late enough in the game, and
22898
+ # so weak that their functioning should not be impacted.
22899
+ am__obj=conftest.${OBJEXT-o}
22904
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
22905
- # mode. It turns out that the SunPro C++ compiler does not properly
22906
- # handle `-M -o', and we need to detect this.
22907
if depmode=$depmode \
22908
- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
22909
+ source=sub/conftest.c object=$am__obj \
22910
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
22911
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
22912
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
22913
>/dev/null 2>conftest.err &&
22914
grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
22915
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
22916
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
22917
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
22918
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
22919
# icc doesn't choke on unknown options, it will just issue warnings
22920
# or remarks (even with -Werror). So we grep stderr for any message
22921
@@ -3548,7 +3695,7 @@
22925
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
22926
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
22927
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
22928
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
22930
@@ -3568,35 +3715,31 @@
22932
case "$am__api_version" in
22934
- { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
22935
-$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
22936
- { (exit 1); exit 1; }; }
22937
+ as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
22943
if test -n "0.40.0"; then
22944
- { $as_echo "$as_me:$LINENO: checking for intltool >= 0.40.0" >&5
22945
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.40.0" >&5
22946
$as_echo_n "checking for intltool >= 0.40.0... " >&6; }
22948
INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.40.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
22949
INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
22950
INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
22952
- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
22953
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
22954
$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
22955
test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
22956
- { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.40.0 or later." >&5
22957
-$as_echo "$as_me: error: Your intltool is too old. You need intltool 0.40.0 or later." >&2;}
22958
- { (exit 1); exit 1; }; }
22959
+ as_fn_error "Your intltool is too old. You need intltool 0.40.0 or later." "$LINENO" 5
22962
# Extract the first word of "intltool-update", so it can be a program name with args.
22963
set dummy intltool-update; ac_word=$2
22964
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
22965
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
22966
$as_echo_n "checking for $ac_word... " >&6; }
22967
-if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then
22968
+if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then :
22969
$as_echo_n "(cached) " >&6
22971
case $INTLTOOL_UPDATE in
22972
@@ -3609,14 +3752,14 @@
22975
test -z "$as_dir" && as_dir=.
22976
- for ac_exec_ext in '' $ac_executable_extensions; do
22977
+ for ac_exec_ext in '' $ac_executable_extensions; do
22978
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
22979
ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
22980
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
22981
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
22990
@@ -3624,19 +3767,19 @@
22992
INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
22993
if test -n "$INTLTOOL_UPDATE"; then
22994
- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
22995
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5
22996
$as_echo "$INTLTOOL_UPDATE" >&6; }
22998
- { $as_echo "$as_me:$LINENO: result: no" >&5
22999
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
23000
$as_echo "no" >&6; }
23004
# Extract the first word of "intltool-merge", so it can be a program name with args.
23005
set dummy intltool-merge; ac_word=$2
23006
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
23007
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
23008
$as_echo_n "checking for $ac_word... " >&6; }
23009
-if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then
23010
+if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then :
23011
$as_echo_n "(cached) " >&6
23013
case $INTLTOOL_MERGE in
23014
@@ -3649,14 +3792,14 @@
23017
test -z "$as_dir" && as_dir=.
23018
- for ac_exec_ext in '' $ac_executable_extensions; do
23019
+ for ac_exec_ext in '' $ac_executable_extensions; do
23020
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
23021
ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
23022
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
23023
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
23032
@@ -3664,19 +3807,19 @@
23034
INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
23035
if test -n "$INTLTOOL_MERGE"; then
23036
- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
23037
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5
23038
$as_echo "$INTLTOOL_MERGE" >&6; }
23040
- { $as_echo "$as_me:$LINENO: result: no" >&5
23041
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
23042
$as_echo "no" >&6; }
23046
# Extract the first word of "intltool-extract", so it can be a program name with args.
23047
set dummy intltool-extract; ac_word=$2
23048
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
23049
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
23050
$as_echo_n "checking for $ac_word... " >&6; }
23051
-if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then
23052
+if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then :
23053
$as_echo_n "(cached) " >&6
23055
case $INTLTOOL_EXTRACT in
23056
@@ -3689,14 +3832,14 @@
23059
test -z "$as_dir" && as_dir=.
23060
- for ac_exec_ext in '' $ac_executable_extensions; do
23061
+ for ac_exec_ext in '' $ac_executable_extensions; do
23062
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
23063
ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
23064
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
23065
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
23074
@@ -3704,18 +3847,16 @@
23076
INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
23077
if test -n "$INTLTOOL_EXTRACT"; then
23078
- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
23079
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5
23080
$as_echo "$INTLTOOL_EXTRACT" >&6; }
23082
- { $as_echo "$as_me:$LINENO: result: no" >&5
23083
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
23084
$as_echo "no" >&6; }
23088
if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
23089
- { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
23090
-$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
23091
- { (exit 1); exit 1; }; }
23092
+ as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5
23095
INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
23096
@@ -3837,9 +3978,9 @@
23097
# Check the gettext tools to make sure they are GNU
23098
# Extract the first word of "xgettext", so it can be a program name with args.
23099
set dummy xgettext; ac_word=$2
23100
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
23101
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
23102
$as_echo_n "checking for $ac_word... " >&6; }
23103
-if test "${ac_cv_path_XGETTEXT+set}" = set; then
23104
+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
23105
$as_echo_n "(cached) " >&6
23108
@@ -3852,14 +3993,14 @@
23111
test -z "$as_dir" && as_dir=.
23112
- for ac_exec_ext in '' $ac_executable_extensions; do
23113
+ for ac_exec_ext in '' $ac_executable_extensions; do
23114
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
23115
ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
23116
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
23117
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
23126
@@ -3867,19 +4008,19 @@
23128
XGETTEXT=$ac_cv_path_XGETTEXT
23129
if test -n "$XGETTEXT"; then
23130
- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
23131
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
23132
$as_echo "$XGETTEXT" >&6; }
23134
- { $as_echo "$as_me:$LINENO: result: no" >&5
23135
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
23136
$as_echo "no" >&6; }
23140
# Extract the first word of "msgmerge", so it can be a program name with args.
23141
set dummy msgmerge; ac_word=$2
23142
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
23143
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
23144
$as_echo_n "checking for $ac_word... " >&6; }
23145
-if test "${ac_cv_path_MSGMERGE+set}" = set; then
23146
+if test "${ac_cv_path_MSGMERGE+set}" = set; then :
23147
$as_echo_n "(cached) " >&6
23150
@@ -3892,14 +4033,14 @@
23153
test -z "$as_dir" && as_dir=.
23154
- for ac_exec_ext in '' $ac_executable_extensions; do
23155
+ for ac_exec_ext in '' $ac_executable_extensions; do
23156
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
23157
ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
23158
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
23159
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
23168
@@ -3907,19 +4048,19 @@
23170
MSGMERGE=$ac_cv_path_MSGMERGE
23171
if test -n "$MSGMERGE"; then
23172
- { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5
23173
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
23174
$as_echo "$MSGMERGE" >&6; }
23176
- { $as_echo "$as_me:$LINENO: result: no" >&5
23177
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
23178
$as_echo "no" >&6; }
23182
# Extract the first word of "msgfmt", so it can be a program name with args.
23183
set dummy msgfmt; ac_word=$2
23184
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
23185
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
23186
$as_echo_n "checking for $ac_word... " >&6; }
23187
-if test "${ac_cv_path_MSGFMT+set}" = set; then
23188
+if test "${ac_cv_path_MSGFMT+set}" = set; then :
23189
$as_echo_n "(cached) " >&6
23192
@@ -3932,14 +4073,14 @@
23195
test -z "$as_dir" && as_dir=.
23196
- for ac_exec_ext in '' $ac_executable_extensions; do
23197
+ for ac_exec_ext in '' $ac_executable_extensions; do
23198
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
23199
ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
23200
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
23201
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
23210
@@ -3947,19 +4088,19 @@
23212
MSGFMT=$ac_cv_path_MSGFMT
23213
if test -n "$MSGFMT"; then
23214
- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
23215
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
23216
$as_echo "$MSGFMT" >&6; }
23218
- { $as_echo "$as_me:$LINENO: result: no" >&5
23219
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
23220
$as_echo "no" >&6; }
23224
# Extract the first word of "gmsgfmt", so it can be a program name with args.
23225
set dummy gmsgfmt; ac_word=$2
23226
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
23227
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
23228
$as_echo_n "checking for $ac_word... " >&6; }
23229
-if test "${ac_cv_path_GMSGFMT+set}" = set; then
23230
+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
23231
$as_echo_n "(cached) " >&6
23234
@@ -3972,14 +4113,14 @@
23237
test -z "$as_dir" && as_dir=.
23238
- for ac_exec_ext in '' $ac_executable_extensions; do
23239
+ for ac_exec_ext in '' $ac_executable_extensions; do
23240
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
23241
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
23242
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
23243
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
23251
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
23252
@@ -3988,33 +4129,29 @@
23254
GMSGFMT=$ac_cv_path_GMSGFMT
23255
if test -n "$GMSGFMT"; then
23256
- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
23257
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
23258
$as_echo "$GMSGFMT" >&6; }
23260
- { $as_echo "$as_me:$LINENO: result: no" >&5
23261
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
23262
$as_echo "no" >&6; }
23266
if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
23267
- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
23268
-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
23269
- { (exit 1); exit 1; }; }
23270
+ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
23272
xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
23273
mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
23274
mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
23275
if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
23276
- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
23277
-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
23278
- { (exit 1); exit 1; }; }
23279
+ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
23282
# Extract the first word of "perl", so it can be a program name with args.
23283
set dummy perl; ac_word=$2
23284
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
23285
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
23286
$as_echo_n "checking for $ac_word... " >&6; }
23287
-if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
23288
+if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then :
23289
$as_echo_n "(cached) " >&6
23291
case $INTLTOOL_PERL in
23292
@@ -4027,14 +4164,14 @@
23295
test -z "$as_dir" && as_dir=.
23296
- for ac_exec_ext in '' $ac_executable_extensions; do
23297
+ for ac_exec_ext in '' $ac_executable_extensions; do
23298
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
23299
ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
23300
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
23301
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
23310
@@ -4042,41 +4179,35 @@
23312
INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
23313
if test -n "$INTLTOOL_PERL"; then
23314
- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
23315
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5
23316
$as_echo "$INTLTOOL_PERL" >&6; }
23318
- { $as_echo "$as_me:$LINENO: result: no" >&5
23319
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
23320
$as_echo "no" >&6; }
23324
if test -z "$INTLTOOL_PERL"; then
23325
- { { $as_echo "$as_me:$LINENO: error: perl not found" >&5
23326
-$as_echo "$as_me: error: perl not found" >&2;}
23327
- { (exit 1); exit 1; }; }
23328
+ as_fn_error "perl not found" "$LINENO" 5
23330
-{ $as_echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5
23331
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
23332
$as_echo_n "checking for perl >= 5.8.1... " >&6; }
23333
$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
23334
if test $? -ne 0; then
23335
- { { $as_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5
23336
-$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;}
23337
- { (exit 1); exit 1; }; }
23338
+ as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5
23340
IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
23341
- { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5
23342
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
23343
$as_echo "$IT_PERL_VERSION" >&6; }
23345
if test "x" != "xno-xml"; then
23346
- { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5
23347
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
23348
$as_echo_n "checking for XML::Parser... " >&6; }
23349
if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
23350
- { $as_echo "$as_me:$LINENO: result: ok" >&5
23351
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
23352
$as_echo "ok" >&6; }
23354
- { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
23355
-$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
23356
- { (exit 1); exit 1; }; }
23357
+ as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
23361
@@ -4086,11 +4217,7 @@
23362
# Set DATADIRNAME correctly if it is not set yet
23363
# (copied from glib-gettext.m4)
23364
if test -z "$DATADIRNAME"; then
23365
- cat >conftest.$ac_ext <<_ACEOF
23368
-cat confdefs.h >>conftest.$ac_ext
23369
-cat >>conftest.$ac_ext <<_ACEOF
23370
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
23371
/* end confdefs.h. */
23374
@@ -4102,120 +4229,13 @@
23378
-rm -f conftest.$ac_objext conftest$ac_exeext
23379
-if { (ac_try="$ac_link"
23380
-case "(($ac_try" in
23381
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
23382
- *) ac_try_echo=$ac_try;;
23384
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
23385
-$as_echo "$ac_try_echo") >&5
23386
- (eval "$ac_link") 2>conftest.er1
23388
- grep -v '^ *+' conftest.er1 >conftest.err
23389
- rm -f conftest.er1
23390
- cat conftest.err >&5
23391
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
23392
- (exit $ac_status); } && {
23393
- test -z "$ac_c_werror_flag" ||
23394
- test ! -s conftest.err
23395
- } && test -s conftest$ac_exeext && {
23396
- test "$cross_compiling" = yes ||
23397
- $as_test_x conftest$ac_exeext
23399
+if ac_fn_c_try_link "$LINENO"; then :
23402
- $as_echo "$as_me: failed program was:" >&5
23403
-sed 's/^/| /' conftest.$ac_ext >&5
23408
- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
23409
-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
23410
-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
23411
- $as_echo_n "(cached) " >&6
23413
- cat >conftest.$ac_ext <<_ACEOF
23416
-cat confdefs.h >>conftest.$ac_ext
23417
-cat >>conftest.$ac_ext <<_ACEOF
23418
-/* end confdefs.h. */
23419
-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
23420
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
23421
-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
23423
-/* System header to define __stub macros and hopefully few prototypes,
23424
- which can conflict with char bind_textdomain_codeset (); below.
23425
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
23426
- <limits.h> exists even on freestanding compilers. */
23429
-# include <limits.h>
23431
-# include <assert.h>
23434
-#undef bind_textdomain_codeset
23436
-/* Override any GCC internal prototype to avoid an error.
23437
- Use char because int might match the return type of a GCC
23438
- builtin and then its argument prototype would still apply. */
23439
-#ifdef __cplusplus
23442
-char bind_textdomain_codeset ();
23443
-/* The GNU C library defines this for functions which it implements
23444
- to always fail with ENOSYS. Some functions are actually named
23445
- something starting with __ and the normal name is an alias. */
23446
-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
23453
-return bind_textdomain_codeset ();
23458
-rm -f conftest.$ac_objext conftest$ac_exeext
23459
-if { (ac_try="$ac_link"
23460
-case "(($ac_try" in
23461
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
23462
- *) ac_try_echo=$ac_try;;
23464
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
23465
-$as_echo "$ac_try_echo") >&5
23466
- (eval "$ac_link") 2>conftest.er1
23468
- grep -v '^ *+' conftest.er1 >conftest.err
23469
- rm -f conftest.er1
23470
- cat conftest.err >&5
23471
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
23472
- (exit $ac_status); } && {
23473
- test -z "$ac_c_werror_flag" ||
23474
- test ! -s conftest.err
23475
- } && test -s conftest$ac_exeext && {
23476
- test "$cross_compiling" = yes ||
23477
- $as_test_x conftest$ac_exeext
23479
- ac_cv_func_bind_textdomain_codeset=yes
23481
- $as_echo "$as_me: failed program was:" >&5
23482
-sed 's/^/| /' conftest.$ac_ext >&5
23484
- ac_cv_func_bind_textdomain_codeset=no
23487
-rm -rf conftest.dSYM
23488
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
23489
- conftest$ac_exeext conftest.$ac_ext
23491
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
23492
-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
23493
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
23494
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
23495
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
23499
@@ -4227,10 +4247,8 @@
23504
-rm -rf conftest.dSYM
23505
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
23506
- conftest$ac_exeext conftest.$ac_ext
23507
+rm -f core conftest.err conftest.$ac_objext \
23508
+ conftest$ac_exeext conftest.$ac_ext
23512
@@ -4243,9 +4261,9 @@
23513
if test -n "$ac_tool_prefix"; then
23514
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
23515
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
23516
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
23517
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
23518
$as_echo_n "checking for $ac_word... " >&6; }
23519
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
23520
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
23521
$as_echo_n "(cached) " >&6
23523
case $PKG_CONFIG in
23524
@@ -4258,14 +4276,14 @@
23527
test -z "$as_dir" && as_dir=.
23528
- for ac_exec_ext in '' $ac_executable_extensions; do
23529
+ for ac_exec_ext in '' $ac_executable_extensions; do
23530
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
23531
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
23532
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
23533
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
23542
@@ -4273,10 +4291,10 @@
23544
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
23545
if test -n "$PKG_CONFIG"; then
23546
- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
23547
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
23548
$as_echo "$PKG_CONFIG" >&6; }
23550
- { $as_echo "$as_me:$LINENO: result: no" >&5
23551
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
23552
$as_echo "no" >&6; }
23555
@@ -4286,9 +4304,9 @@
23556
ac_pt_PKG_CONFIG=$PKG_CONFIG
23557
# Extract the first word of "pkg-config", so it can be a program name with args.
23558
set dummy pkg-config; ac_word=$2
23559
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
23560
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
23561
$as_echo_n "checking for $ac_word... " >&6; }
23562
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
23563
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
23564
$as_echo_n "(cached) " >&6
23566
case $ac_pt_PKG_CONFIG in
23567
@@ -4301,14 +4319,14 @@
23570
test -z "$as_dir" && as_dir=.
23571
- for ac_exec_ext in '' $ac_executable_extensions; do
23572
+ for ac_exec_ext in '' $ac_executable_extensions; do
23573
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
23574
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
23575
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
23576
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
23585
@@ -4316,10 +4334,10 @@
23587
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
23588
if test -n "$ac_pt_PKG_CONFIG"; then
23589
- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
23590
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
23591
$as_echo "$ac_pt_PKG_CONFIG" >&6; }
23593
- { $as_echo "$as_me:$LINENO: result: no" >&5
23594
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
23595
$as_echo "no" >&6; }
23598
@@ -4328,7 +4346,7 @@
23600
case $cross_compiling:$ac_tool_warned in
23602
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
23603
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
23604
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
23605
ac_tool_warned=yes ;;
23607
@@ -4341,13 +4359,13 @@
23609
if test -n "$PKG_CONFIG"; then
23610
_pkg_min_version=0.19
23611
- { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
23612
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
23613
$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
23614
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
23615
- { $as_echo "$as_me:$LINENO: result: yes" >&5
23616
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
23617
$as_echo "yes" >&6; }
23619
- { $as_echo "$as_me:$LINENO: result: no" >&5
23620
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
23621
$as_echo "no" >&6; }
23624
@@ -4362,14 +4380,14 @@
23625
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
23626
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
23627
ac_compiler_gnu=$ac_cv_c_compiler_gnu
23628
-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
23629
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
23630
$as_echo_n "checking how to run the C preprocessor... " >&6; }
23631
# On Suns, sometimes $CPP names a directory.
23632
if test -n "$CPP" && test -d "$CPP"; then
23635
if test -z "$CPP"; then
23636
- if test "${ac_cv_prog_CPP+set}" = set; then
23637
+ if test "${ac_cv_prog_CPP+set}" = set; then :
23638
$as_echo_n "(cached) " >&6
23640
# Double quotes because CPP needs to be expanded
23641
@@ -4384,11 +4402,7 @@
23642
# <limits.h> exists even on freestanding compilers.
23643
# On the NeXT, cc -E runs the code through the compiler's parser,
23644
# not just through cpp. "Syntax error" is here to catch this case.
23645
- cat >conftest.$ac_ext <<_ACEOF
23648
-cat confdefs.h >>conftest.$ac_ext
23649
-cat >>conftest.$ac_ext <<_ACEOF
23650
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
23651
/* end confdefs.h. */
23653
# include <limits.h>
23654
@@ -4397,78 +4411,34 @@
23658
-if { (ac_try="$ac_cpp conftest.$ac_ext"
23659
-case "(($ac_try" in
23660
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
23661
- *) ac_try_echo=$ac_try;;
23663
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
23664
-$as_echo "$ac_try_echo") >&5
23665
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
23667
- grep -v '^ *+' conftest.er1 >conftest.err
23668
- rm -f conftest.er1
23669
- cat conftest.err >&5
23670
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
23671
- (exit $ac_status); } >/dev/null && {
23672
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
23673
- test ! -s conftest.err
23677
- $as_echo "$as_me: failed program was:" >&5
23678
-sed 's/^/| /' conftest.$ac_ext >&5
23679
+if ac_fn_c_try_cpp "$LINENO"; then :
23682
# Broken: fails on valid input.
23686
rm -f conftest.err conftest.$ac_ext
23688
# OK, works on sane cases. Now check whether nonexistent headers
23689
# can be detected and how.
23690
- cat >conftest.$ac_ext <<_ACEOF
23693
-cat confdefs.h >>conftest.$ac_ext
23694
-cat >>conftest.$ac_ext <<_ACEOF
23695
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
23696
/* end confdefs.h. */
23697
#include <ac_nonexistent.h>
23699
-if { (ac_try="$ac_cpp conftest.$ac_ext"
23700
-case "(($ac_try" in
23701
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
23702
- *) ac_try_echo=$ac_try;;
23704
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
23705
-$as_echo "$ac_try_echo") >&5
23706
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
23708
- grep -v '^ *+' conftest.er1 >conftest.err
23709
- rm -f conftest.er1
23710
- cat conftest.err >&5
23711
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
23712
- (exit $ac_status); } >/dev/null && {
23713
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
23714
- test ! -s conftest.err
23716
+if ac_fn_c_try_cpp "$LINENO"; then :
23717
# Broken: success on invalid input.
23720
- $as_echo "$as_me: failed program was:" >&5
23721
-sed 's/^/| /' conftest.$ac_ext >&5
23723
# Passes both tests.
23728
rm -f conftest.err conftest.$ac_ext
23731
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
23732
rm -f conftest.err conftest.$ac_ext
23733
-if $ac_preproc_ok; then
23734
+if $ac_preproc_ok; then :
23738
@@ -4480,7 +4450,7 @@
23740
ac_cv_prog_CPP=$CPP
23742
-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
23743
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
23744
$as_echo "$CPP" >&6; }
23745
ac_preproc_ok=false
23746
for ac_c_preproc_warn_flag in '' yes
23747
@@ -4491,11 +4461,7 @@
23748
# <limits.h> exists even on freestanding compilers.
23749
# On the NeXT, cc -E runs the code through the compiler's parser,
23750
# not just through cpp. "Syntax error" is here to catch this case.
23751
- cat >conftest.$ac_ext <<_ACEOF
23754
-cat confdefs.h >>conftest.$ac_ext
23755
-cat >>conftest.$ac_ext <<_ACEOF
23756
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
23757
/* end confdefs.h. */
23759
# include <limits.h>
23760
@@ -4504,87 +4470,40 @@
23764
-if { (ac_try="$ac_cpp conftest.$ac_ext"
23765
-case "(($ac_try" in
23766
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
23767
- *) ac_try_echo=$ac_try;;
23769
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
23770
-$as_echo "$ac_try_echo") >&5
23771
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
23773
- grep -v '^ *+' conftest.er1 >conftest.err
23774
- rm -f conftest.er1
23775
- cat conftest.err >&5
23776
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
23777
- (exit $ac_status); } >/dev/null && {
23778
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
23779
- test ! -s conftest.err
23783
- $as_echo "$as_me: failed program was:" >&5
23784
-sed 's/^/| /' conftest.$ac_ext >&5
23785
+if ac_fn_c_try_cpp "$LINENO"; then :
23788
# Broken: fails on valid input.
23792
rm -f conftest.err conftest.$ac_ext
23794
# OK, works on sane cases. Now check whether nonexistent headers
23795
# can be detected and how.
23796
- cat >conftest.$ac_ext <<_ACEOF
23799
-cat confdefs.h >>conftest.$ac_ext
23800
-cat >>conftest.$ac_ext <<_ACEOF
23801
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
23802
/* end confdefs.h. */
23803
#include <ac_nonexistent.h>
23805
-if { (ac_try="$ac_cpp conftest.$ac_ext"
23806
-case "(($ac_try" in
23807
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
23808
- *) ac_try_echo=$ac_try;;
23810
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
23811
-$as_echo "$ac_try_echo") >&5
23812
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
23814
- grep -v '^ *+' conftest.er1 >conftest.err
23815
- rm -f conftest.er1
23816
- cat conftest.err >&5
23817
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
23818
- (exit $ac_status); } >/dev/null && {
23819
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
23820
- test ! -s conftest.err
23822
+if ac_fn_c_try_cpp "$LINENO"; then :
23823
# Broken: success on invalid input.
23826
- $as_echo "$as_me: failed program was:" >&5
23827
-sed 's/^/| /' conftest.$ac_ext >&5
23829
# Passes both tests.
23834
rm -f conftest.err conftest.$ac_ext
23837
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
23838
rm -f conftest.err conftest.$ac_ext
23839
-if $ac_preproc_ok; then
23841
+if $ac_preproc_ok; then :
23844
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
23845
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
23846
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
23847
-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
23848
-See \`config.log' for more details." >&5
23849
-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
23850
-See \`config.log' for more details." >&2;}
23851
- { (exit 1); exit 1; }; }; }
23852
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
23853
+See \`config.log' for more details." "$LINENO" 5; }
23857
@@ -4594,9 +4513,9 @@
23858
ac_compiler_gnu=$ac_cv_c_compiler_gnu
23861
-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
23862
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
23863
$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
23864
-if test "${ac_cv_path_GREP+set}" = set; then
23865
+if test "${ac_cv_path_GREP+set}" = set; then :
23866
$as_echo_n "(cached) " >&6
23868
if test -z "$GREP"; then
23869
@@ -4607,7 +4526,7 @@
23872
test -z "$as_dir" && as_dir=.
23873
- for ac_prog in grep ggrep; do
23874
+ for ac_prog in grep ggrep; do
23875
for ac_exec_ext in '' $ac_executable_extensions; do
23876
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
23877
{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
23878
@@ -4627,7 +4546,7 @@
23879
$as_echo 'GREP' >> "conftest.nl"
23880
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
23881
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
23882
- ac_count=`expr $ac_count + 1`
23883
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
23884
if test $ac_count -gt ${ac_path_GREP_max-0}; then
23885
# Best one so far, save it but keep looking for a better one
23886
ac_cv_path_GREP="$ac_path_GREP"
23887
@@ -4642,26 +4561,24 @@
23888
$ac_path_GREP_found && break 3
23894
if test -z "$ac_cv_path_GREP"; then
23895
- { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
23896
-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
23897
- { (exit 1); exit 1; }; }
23898
+ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
23901
ac_cv_path_GREP=$GREP
23905
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
23906
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
23907
$as_echo "$ac_cv_path_GREP" >&6; }
23908
GREP="$ac_cv_path_GREP"
23911
-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
23912
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
23913
$as_echo_n "checking for egrep... " >&6; }
23914
-if test "${ac_cv_path_EGREP+set}" = set; then
23915
+if test "${ac_cv_path_EGREP+set}" = set; then :
23916
$as_echo_n "(cached) " >&6
23918
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
23919
@@ -4675,7 +4592,7 @@
23922
test -z "$as_dir" && as_dir=.
23923
- for ac_prog in egrep; do
23924
+ for ac_prog in egrep; do
23925
for ac_exec_ext in '' $ac_executable_extensions; do
23926
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
23927
{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
23928
@@ -4695,7 +4612,7 @@
23929
$as_echo 'EGREP' >> "conftest.nl"
23930
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
23931
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
23932
- ac_count=`expr $ac_count + 1`
23933
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
23934
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
23935
# Best one so far, save it but keep looking for a better one
23936
ac_cv_path_EGREP="$ac_path_EGREP"
23937
@@ -4710,12 +4627,10 @@
23938
$ac_path_EGREP_found && break 3
23944
if test -z "$ac_cv_path_EGREP"; then
23945
- { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
23946
-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
23947
- { (exit 1); exit 1; }; }
23948
+ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
23951
ac_cv_path_EGREP=$EGREP
23952
@@ -4723,21 +4638,17 @@
23956
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
23957
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
23958
$as_echo "$ac_cv_path_EGREP" >&6; }
23959
EGREP="$ac_cv_path_EGREP"
23962
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
23963
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
23964
$as_echo_n "checking for ANSI C header files... " >&6; }
23965
-if test "${ac_cv_header_stdc+set}" = set; then
23966
+if test "${ac_cv_header_stdc+set}" = set; then :
23967
$as_echo_n "(cached) " >&6
23969
- cat >conftest.$ac_ext <<_ACEOF
23972
-cat confdefs.h >>conftest.$ac_ext
23973
-cat >>conftest.$ac_ext <<_ACEOF
23974
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
23975
/* end confdefs.h. */
23976
#include <stdlib.h>
23977
#include <stdarg.h>
23978
@@ -4752,48 +4663,23 @@
23982
-rm -f conftest.$ac_objext
23983
-if { (ac_try="$ac_compile"
23984
-case "(($ac_try" in
23985
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
23986
- *) ac_try_echo=$ac_try;;
23988
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
23989
-$as_echo "$ac_try_echo") >&5
23990
- (eval "$ac_compile") 2>conftest.er1
23992
- grep -v '^ *+' conftest.er1 >conftest.err
23993
- rm -f conftest.er1
23994
- cat conftest.err >&5
23995
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
23996
- (exit $ac_status); } && {
23997
- test -z "$ac_c_werror_flag" ||
23998
- test ! -s conftest.err
23999
- } && test -s conftest.$ac_objext; then
24000
+if ac_fn_c_try_compile "$LINENO"; then :
24001
ac_cv_header_stdc=yes
24003
- $as_echo "$as_me: failed program was:" >&5
24004
-sed 's/^/| /' conftest.$ac_ext >&5
24006
- ac_cv_header_stdc=no
24007
+ ac_cv_header_stdc=no
24010
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
24012
if test $ac_cv_header_stdc = yes; then
24013
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
24014
- cat >conftest.$ac_ext <<_ACEOF
24017
-cat confdefs.h >>conftest.$ac_ext
24018
-cat >>conftest.$ac_ext <<_ACEOF
24019
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
24020
/* end confdefs.h. */
24021
#include <string.h>
24024
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
24025
- $EGREP "memchr" >/dev/null 2>&1; then
24027
+ $EGREP "memchr" >/dev/null 2>&1; then :
24030
ac_cv_header_stdc=no
24032
@@ -4803,18 +4689,14 @@
24034
if test $ac_cv_header_stdc = yes; then
24035
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
24036
- cat >conftest.$ac_ext <<_ACEOF
24039
-cat confdefs.h >>conftest.$ac_ext
24040
-cat >>conftest.$ac_ext <<_ACEOF
24041
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
24042
/* end confdefs.h. */
24043
#include <stdlib.h>
24046
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
24047
- $EGREP "free" >/dev/null 2>&1; then
24049
+ $EGREP "free" >/dev/null 2>&1; then :
24052
ac_cv_header_stdc=no
24054
@@ -4824,14 +4706,10 @@
24056
if test $ac_cv_header_stdc = yes; then
24057
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
24058
- if test "$cross_compiling" = yes; then
24059
+ if test "$cross_compiling" = yes; then :
24062
- cat >conftest.$ac_ext <<_ACEOF
24065
-cat confdefs.h >>conftest.$ac_ext
24066
-cat >>conftest.$ac_ext <<_ACEOF
24067
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
24068
/* end confdefs.h. */
24070
#include <stdlib.h>
24071
@@ -4858,290 +4736,63 @@
24075
-rm -f conftest$ac_exeext
24076
-if { (ac_try="$ac_link"
24077
-case "(($ac_try" in
24078
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
24079
- *) ac_try_echo=$ac_try;;
24081
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
24082
-$as_echo "$ac_try_echo") >&5
24083
- (eval "$ac_link") 2>&5
24085
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
24086
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
24087
- { (case "(($ac_try" in
24088
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
24089
- *) ac_try_echo=$ac_try;;
24091
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
24092
-$as_echo "$ac_try_echo") >&5
24093
- (eval "$ac_try") 2>&5
24095
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
24096
- (exit $ac_status); }; }; then
24099
- $as_echo "$as_me: program exited with status $ac_status" >&5
24100
-$as_echo "$as_me: failed program was:" >&5
24101
-sed 's/^/| /' conftest.$ac_ext >&5
24102
+if ac_fn_c_try_run "$LINENO"; then :
24104
-( exit $ac_status )
24105
-ac_cv_header_stdc=no
24107
+ ac_cv_header_stdc=no
24109
-rm -rf conftest.dSYM
24110
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
24111
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
24112
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
24118
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
24119
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
24120
$as_echo "$ac_cv_header_stdc" >&6; }
24121
if test $ac_cv_header_stdc = yes; then
24123
-cat >>confdefs.h <<\_ACEOF
24124
-#define STDC_HEADERS 1
24126
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
24130
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
24131
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
24132
+ inttypes.h stdint.h unistd.h
24134
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
24135
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
24137
+eval as_val=\$$as_ac_Header
24138
+ if test "x$as_val" = x""yes; then :
24139
+ cat >>confdefs.h <<_ACEOF
24140
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
24149
+ for ac_header in locale.h
24151
+ ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
24152
+if test "x$ac_cv_header_locale_h" = x""yes; then :
24153
+ cat >>confdefs.h <<_ACEOF
24154
+#define HAVE_LOCALE_H 1
24161
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
24162
- inttypes.h stdint.h unistd.h
24164
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
24165
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
24166
-$as_echo_n "checking for $ac_header... " >&6; }
24167
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
24168
- $as_echo_n "(cached) " >&6
24170
- cat >conftest.$ac_ext <<_ACEOF
24173
-cat confdefs.h >>conftest.$ac_ext
24174
-cat >>conftest.$ac_ext <<_ACEOF
24175
-/* end confdefs.h. */
24176
-$ac_includes_default
24178
-#include <$ac_header>
24180
-rm -f conftest.$ac_objext
24181
-if { (ac_try="$ac_compile"
24182
-case "(($ac_try" in
24183
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
24184
- *) ac_try_echo=$ac_try;;
24186
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
24187
-$as_echo "$ac_try_echo") >&5
24188
- (eval "$ac_compile") 2>conftest.er1
24190
- grep -v '^ *+' conftest.er1 >conftest.err
24191
- rm -f conftest.er1
24192
- cat conftest.err >&5
24193
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
24194
- (exit $ac_status); } && {
24195
- test -z "$ac_c_werror_flag" ||
24196
- test ! -s conftest.err
24197
- } && test -s conftest.$ac_objext; then
24198
- eval "$as_ac_Header=yes"
24200
- $as_echo "$as_me: failed program was:" >&5
24201
-sed 's/^/| /' conftest.$ac_ext >&5
24203
- eval "$as_ac_Header=no"
24206
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
24208
-ac_res=`eval 'as_val=${'$as_ac_Header'}
24209
- $as_echo "$as_val"'`
24210
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
24211
-$as_echo "$ac_res" >&6; }
24212
-as_val=`eval 'as_val=${'$as_ac_Header'}
24213
- $as_echo "$as_val"'`
24214
- if test "x$as_val" = x""yes; then
24215
- cat >>confdefs.h <<_ACEOF
24216
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
24226
-for ac_header in locale.h
24228
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
24229
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
24230
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
24231
-$as_echo_n "checking for $ac_header... " >&6; }
24232
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
24233
- $as_echo_n "(cached) " >&6
24235
-ac_res=`eval 'as_val=${'$as_ac_Header'}
24236
- $as_echo "$as_val"'`
24237
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
24238
-$as_echo "$ac_res" >&6; }
24240
- # Is the header compilable?
24241
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
24242
-$as_echo_n "checking $ac_header usability... " >&6; }
24243
-cat >conftest.$ac_ext <<_ACEOF
24246
-cat confdefs.h >>conftest.$ac_ext
24247
-cat >>conftest.$ac_ext <<_ACEOF
24248
-/* end confdefs.h. */
24249
-$ac_includes_default
24250
-#include <$ac_header>
24252
-rm -f conftest.$ac_objext
24253
-if { (ac_try="$ac_compile"
24254
-case "(($ac_try" in
24255
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
24256
- *) ac_try_echo=$ac_try;;
24258
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
24259
-$as_echo "$ac_try_echo") >&5
24260
- (eval "$ac_compile") 2>conftest.er1
24262
- grep -v '^ *+' conftest.er1 >conftest.err
24263
- rm -f conftest.er1
24264
- cat conftest.err >&5
24265
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
24266
- (exit $ac_status); } && {
24267
- test -z "$ac_c_werror_flag" ||
24268
- test ! -s conftest.err
24269
- } && test -s conftest.$ac_objext; then
24270
- ac_header_compiler=yes
24272
- $as_echo "$as_me: failed program was:" >&5
24273
-sed 's/^/| /' conftest.$ac_ext >&5
24275
- ac_header_compiler=no
24278
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
24279
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
24280
-$as_echo "$ac_header_compiler" >&6; }
24282
-# Is the header present?
24283
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
24284
-$as_echo_n "checking $ac_header presence... " >&6; }
24285
-cat >conftest.$ac_ext <<_ACEOF
24288
-cat confdefs.h >>conftest.$ac_ext
24289
-cat >>conftest.$ac_ext <<_ACEOF
24290
-/* end confdefs.h. */
24291
-#include <$ac_header>
24293
-if { (ac_try="$ac_cpp conftest.$ac_ext"
24294
-case "(($ac_try" in
24295
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
24296
- *) ac_try_echo=$ac_try;;
24298
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
24299
-$as_echo "$ac_try_echo") >&5
24300
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
24302
- grep -v '^ *+' conftest.er1 >conftest.err
24303
- rm -f conftest.er1
24304
- cat conftest.err >&5
24305
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
24306
- (exit $ac_status); } >/dev/null && {
24307
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
24308
- test ! -s conftest.err
24310
- ac_header_preproc=yes
24312
- $as_echo "$as_me: failed program was:" >&5
24313
-sed 's/^/| /' conftest.$ac_ext >&5
24315
- ac_header_preproc=no
24318
-rm -f conftest.err conftest.$ac_ext
24319
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
24320
-$as_echo "$ac_header_preproc" >&6; }
24322
-# So? What about this header?
24323
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
24325
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
24326
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
24327
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
24328
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
24329
- ac_header_preproc=yes
24332
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
24333
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
24334
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
24335
-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
24336
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
24337
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
24338
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
24339
-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
24340
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
24341
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
24342
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
24343
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
24345
-## ------------------------------------------------------------------------------- ##
24346
-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-icon-theme ##
24347
-## ------------------------------------------------------------------------------- ##
24349
- ) | sed "s/^/$as_me: WARNING: /" >&2
24352
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
24353
-$as_echo_n "checking for $ac_header... " >&6; }
24354
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
24355
- $as_echo_n "(cached) " >&6
24357
- eval "$as_ac_Header=\$ac_header_preproc"
24359
-ac_res=`eval 'as_val=${'$as_ac_Header'}
24360
- $as_echo "$as_val"'`
24361
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
24362
-$as_echo "$ac_res" >&6; }
24365
-as_val=`eval 'as_val=${'$as_ac_Header'}
24366
- $as_echo "$as_val"'`
24367
- if test "x$as_val" = x""yes; then
24368
- cat >>confdefs.h <<_ACEOF
24369
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
24377
if test $ac_cv_header_locale_h = yes; then
24378
- { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
24379
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
24380
$as_echo_n "checking for LC_MESSAGES... " >&6; }
24381
-if test "${am_cv_val_LC_MESSAGES+set}" = set; then
24382
+if test "${am_cv_val_LC_MESSAGES+set}" = set; then :
24383
$as_echo_n "(cached) " >&6
24385
- cat >conftest.$ac_ext <<_ACEOF
24388
-cat confdefs.h >>conftest.$ac_ext
24389
-cat >>conftest.$ac_ext <<_ACEOF
24390
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
24391
/* end confdefs.h. */
24392
#include <locale.h>
24394
@@ -5152,46 +4803,19 @@
24398
-rm -f conftest.$ac_objext conftest$ac_exeext
24399
-if { (ac_try="$ac_link"
24400
-case "(($ac_try" in
24401
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
24402
- *) ac_try_echo=$ac_try;;
24404
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
24405
-$as_echo "$ac_try_echo") >&5
24406
- (eval "$ac_link") 2>conftest.er1
24408
- grep -v '^ *+' conftest.er1 >conftest.err
24409
- rm -f conftest.er1
24410
- cat conftest.err >&5
24411
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
24412
- (exit $ac_status); } && {
24413
- test -z "$ac_c_werror_flag" ||
24414
- test ! -s conftest.err
24415
- } && test -s conftest$ac_exeext && {
24416
- test "$cross_compiling" = yes ||
24417
- $as_test_x conftest$ac_exeext
24419
+if ac_fn_c_try_link "$LINENO"; then :
24420
am_cv_val_LC_MESSAGES=yes
24422
- $as_echo "$as_me: failed program was:" >&5
24423
-sed 's/^/| /' conftest.$ac_ext >&5
24425
- am_cv_val_LC_MESSAGES=no
24426
+ am_cv_val_LC_MESSAGES=no
24429
-rm -rf conftest.dSYM
24430
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
24431
- conftest$ac_exeext conftest.$ac_ext
24432
+rm -f core conftest.err conftest.$ac_objext \
24433
+ conftest$ac_exeext conftest.$ac_ext
24435
-{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
24436
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5
24437
$as_echo "$am_cv_val_LC_MESSAGES" >&6; }
24438
if test $am_cv_val_LC_MESSAGES = yes; then
24440
-cat >>confdefs.h <<\_ACEOF
24441
-#define HAVE_LC_MESSAGES 1
24443
+$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
24447
@@ -5204,155 +4828,20 @@
24451
- if test "${ac_cv_header_libintl_h+set}" = set; then
24452
- { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
24453
-$as_echo_n "checking for libintl.h... " >&6; }
24454
-if test "${ac_cv_header_libintl_h+set}" = set; then
24455
- $as_echo_n "(cached) " >&6
24457
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
24458
-$as_echo "$ac_cv_header_libintl_h" >&6; }
24460
- # Is the header compilable?
24461
-{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5
24462
-$as_echo_n "checking libintl.h usability... " >&6; }
24463
-cat >conftest.$ac_ext <<_ACEOF
24466
-cat confdefs.h >>conftest.$ac_ext
24467
-cat >>conftest.$ac_ext <<_ACEOF
24468
-/* end confdefs.h. */
24469
-$ac_includes_default
24470
-#include <libintl.h>
24472
-rm -f conftest.$ac_objext
24473
-if { (ac_try="$ac_compile"
24474
-case "(($ac_try" in
24475
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
24476
- *) ac_try_echo=$ac_try;;
24478
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
24479
-$as_echo "$ac_try_echo") >&5
24480
- (eval "$ac_compile") 2>conftest.er1
24482
- grep -v '^ *+' conftest.er1 >conftest.err
24483
- rm -f conftest.er1
24484
- cat conftest.err >&5
24485
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
24486
- (exit $ac_status); } && {
24487
- test -z "$ac_c_werror_flag" ||
24488
- test ! -s conftest.err
24489
- } && test -s conftest.$ac_objext; then
24490
- ac_header_compiler=yes
24492
- $as_echo "$as_me: failed program was:" >&5
24493
-sed 's/^/| /' conftest.$ac_ext >&5
24495
- ac_header_compiler=no
24498
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
24499
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
24500
-$as_echo "$ac_header_compiler" >&6; }
24502
-# Is the header present?
24503
-{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5
24504
-$as_echo_n "checking libintl.h presence... " >&6; }
24505
-cat >conftest.$ac_ext <<_ACEOF
24508
-cat confdefs.h >>conftest.$ac_ext
24509
-cat >>conftest.$ac_ext <<_ACEOF
24510
-/* end confdefs.h. */
24511
-#include <libintl.h>
24513
-if { (ac_try="$ac_cpp conftest.$ac_ext"
24514
-case "(($ac_try" in
24515
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
24516
- *) ac_try_echo=$ac_try;;
24518
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
24519
-$as_echo "$ac_try_echo") >&5
24520
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
24522
- grep -v '^ *+' conftest.er1 >conftest.err
24523
- rm -f conftest.er1
24524
- cat conftest.err >&5
24525
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
24526
- (exit $ac_status); } >/dev/null && {
24527
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
24528
- test ! -s conftest.err
24530
- ac_header_preproc=yes
24532
- $as_echo "$as_me: failed program was:" >&5
24533
-sed 's/^/| /' conftest.$ac_ext >&5
24535
- ac_header_preproc=no
24538
-rm -f conftest.err conftest.$ac_ext
24539
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
24540
-$as_echo "$ac_header_preproc" >&6; }
24542
-# So? What about this header?
24543
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
24545
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
24546
-$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
24547
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5
24548
-$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}
24549
- ac_header_preproc=yes
24552
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5
24553
-$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
24554
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5
24555
-$as_echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;}
24556
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5
24557
-$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}
24558
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5
24559
-$as_echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;}
24560
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
24561
-$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
24562
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
24563
-$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
24565
-## ------------------------------------------------------------------------------- ##
24566
-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-icon-theme ##
24567
-## ------------------------------------------------------------------------------- ##
24569
- ) | sed "s/^/$as_me: WARNING: /" >&2
24572
-{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
24573
-$as_echo_n "checking for libintl.h... " >&6; }
24574
-if test "${ac_cv_header_libintl_h+set}" = set; then
24575
- $as_echo_n "(cached) " >&6
24577
- ac_cv_header_libintl_h=$ac_header_preproc
24579
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
24580
-$as_echo "$ac_cv_header_libintl_h" >&6; }
24583
-if test "x$ac_cv_header_libintl_h" = x""yes; then
24584
+ ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
24585
+if test "x$ac_cv_header_libintl_h" = x""yes; then :
24586
gt_cv_func_dgettext_libintl="no"
24587
libintl_extra_libs=""
24590
# First check in libc
24592
- { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&5
24593
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5
24594
$as_echo_n "checking for ngettext in libc... " >&6; }
24595
-if test "${gt_cv_func_ngettext_libc+set}" = set; then
24596
+if test "${gt_cv_func_ngettext_libc+set}" = set; then :
24597
$as_echo_n "(cached) " >&6
24599
- cat >conftest.$ac_ext <<_ACEOF
24602
-cat confdefs.h >>conftest.$ac_ext
24603
-cat >>conftest.$ac_ext <<_ACEOF
24604
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
24605
/* end confdefs.h. */
24607
#include <libintl.h>
24608
@@ -5365,201 +4854,57 @@
24612
-rm -f conftest.$ac_objext conftest$ac_exeext
24613
-if { (ac_try="$ac_link"
24614
-case "(($ac_try" in
24615
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
24616
- *) ac_try_echo=$ac_try;;
24618
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
24619
-$as_echo "$ac_try_echo") >&5
24620
- (eval "$ac_link") 2>conftest.er1
24622
- grep -v '^ *+' conftest.er1 >conftest.err
24623
- rm -f conftest.er1
24624
- cat conftest.err >&5
24625
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
24626
- (exit $ac_status); } && {
24627
- test -z "$ac_c_werror_flag" ||
24628
- test ! -s conftest.err
24629
- } && test -s conftest$ac_exeext && {
24630
- test "$cross_compiling" = yes ||
24631
- $as_test_x conftest$ac_exeext
24633
+if ac_fn_c_try_link "$LINENO"; then :
24634
gt_cv_func_ngettext_libc=yes
24636
- $as_echo "$as_me: failed program was:" >&5
24637
-sed 's/^/| /' conftest.$ac_ext >&5
24639
- gt_cv_func_ngettext_libc=no
24640
+ gt_cv_func_ngettext_libc=no
24643
-rm -rf conftest.dSYM
24644
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
24645
- conftest$ac_exeext conftest.$ac_ext
24646
+rm -f core conftest.err conftest.$ac_objext \
24647
+ conftest$ac_exeext conftest.$ac_ext
24650
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
24651
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5
24652
$as_echo "$gt_cv_func_ngettext_libc" >&6; }
24654
if test "$gt_cv_func_ngettext_libc" = "yes" ; then
24655
- { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5
24656
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
24657
$as_echo_n "checking for dgettext in libc... " >&6; }
24658
-if test "${gt_cv_func_dgettext_libc+set}" = set; then
24659
- $as_echo_n "(cached) " >&6
24661
- cat >conftest.$ac_ext <<_ACEOF
24664
-cat confdefs.h >>conftest.$ac_ext
24665
-cat >>conftest.$ac_ext <<_ACEOF
24666
-/* end confdefs.h. */
24668
-#include <libintl.h>
24673
-return !dgettext ("","")
24678
-rm -f conftest.$ac_objext conftest$ac_exeext
24679
-if { (ac_try="$ac_link"
24680
-case "(($ac_try" in
24681
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
24682
- *) ac_try_echo=$ac_try;;
24684
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
24685
-$as_echo "$ac_try_echo") >&5
24686
- (eval "$ac_link") 2>conftest.er1
24688
- grep -v '^ *+' conftest.er1 >conftest.err
24689
- rm -f conftest.er1
24690
- cat conftest.err >&5
24691
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
24692
- (exit $ac_status); } && {
24693
- test -z "$ac_c_werror_flag" ||
24694
- test ! -s conftest.err
24695
- } && test -s conftest$ac_exeext && {
24696
- test "$cross_compiling" = yes ||
24697
- $as_test_x conftest$ac_exeext
24699
- gt_cv_func_dgettext_libc=yes
24701
- $as_echo "$as_me: failed program was:" >&5
24702
-sed 's/^/| /' conftest.$ac_ext >&5
24704
- gt_cv_func_dgettext_libc=no
24707
-rm -rf conftest.dSYM
24708
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
24709
- conftest$ac_exeext conftest.$ac_ext
24712
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
24713
-$as_echo "$gt_cv_func_dgettext_libc" >&6; }
24716
- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
24718
-for ac_func in bind_textdomain_codeset
24720
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
24721
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
24722
-$as_echo_n "checking for $ac_func... " >&6; }
24723
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
24724
+if test "${gt_cv_func_dgettext_libc+set}" = set; then :
24725
$as_echo_n "(cached) " >&6
24727
- cat >conftest.$ac_ext <<_ACEOF
24730
-cat confdefs.h >>conftest.$ac_ext
24731
-cat >>conftest.$ac_ext <<_ACEOF
24732
-/* end confdefs.h. */
24733
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
24734
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
24735
-#define $ac_func innocuous_$ac_func
24737
-/* System header to define __stub macros and hopefully few prototypes,
24738
- which can conflict with char $ac_func (); below.
24739
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
24740
- <limits.h> exists even on freestanding compilers. */
24743
-# include <limits.h>
24745
-# include <assert.h>
24750
-/* Override any GCC internal prototype to avoid an error.
24751
- Use char because int might match the return type of a GCC
24752
- builtin and then its argument prototype would still apply. */
24753
-#ifdef __cplusplus
24757
-/* The GNU C library defines this for functions which it implements
24758
- to always fail with ENOSYS. Some functions are actually named
24759
- something starting with __ and the normal name is an alias. */
24760
-#if defined __stub_$ac_func || defined __stub___$ac_func
24767
-return $ac_func ();
24772
-rm -f conftest.$ac_objext conftest$ac_exeext
24773
-if { (ac_try="$ac_link"
24774
-case "(($ac_try" in
24775
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
24776
- *) ac_try_echo=$ac_try;;
24778
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
24779
-$as_echo "$ac_try_echo") >&5
24780
- (eval "$ac_link") 2>conftest.er1
24782
- grep -v '^ *+' conftest.er1 >conftest.err
24783
- rm -f conftest.er1
24784
- cat conftest.err >&5
24785
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
24786
- (exit $ac_status); } && {
24787
- test -z "$ac_c_werror_flag" ||
24788
- test ! -s conftest.err
24789
- } && test -s conftest$ac_exeext && {
24790
- test "$cross_compiling" = yes ||
24791
- $as_test_x conftest$ac_exeext
24793
- eval "$as_ac_var=yes"
24795
- $as_echo "$as_me: failed program was:" >&5
24796
-sed 's/^/| /' conftest.$ac_ext >&5
24797
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
24798
+/* end confdefs.h. */
24800
+#include <libintl.h>
24802
- eval "$as_ac_var=no"
24806
+return !dgettext ("","")
24811
+if ac_fn_c_try_link "$LINENO"; then :
24812
+ gt_cv_func_dgettext_libc=yes
24814
+ gt_cv_func_dgettext_libc=no
24816
+rm -f core conftest.err conftest.$ac_objext \
24817
+ conftest$ac_exeext conftest.$ac_ext
24819
-rm -rf conftest.dSYM
24820
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
24821
- conftest$ac_exeext conftest.$ac_ext
24823
-ac_res=`eval 'as_val=${'$as_ac_var'}
24824
- $as_echo "$as_val"'`
24825
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
24826
-$as_echo "$ac_res" >&6; }
24827
-as_val=`eval 'as_val=${'$as_ac_var'}
24828
- $as_echo "$as_val"'`
24829
- if test "x$as_val" = x""yes; then
24830
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5
24831
+$as_echo "$gt_cv_func_dgettext_libc" >&6; }
24834
+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
24835
+ for ac_func in bind_textdomain_codeset
24837
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
24838
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
24839
cat >>confdefs.h <<_ACEOF
24840
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
24841
+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
24845
@@ -5574,18 +4919,14 @@
24846
|| test "$gt_cv_func_ngettext_libc" != "yes" \
24847
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
24849
- { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
24850
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
24851
$as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
24852
-if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
24853
+if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
24854
$as_echo_n "(cached) " >&6
24856
ac_check_lib_save_LIBS=$LIBS
24857
LIBS="-lintl $LIBS"
24858
-cat >conftest.$ac_ext <<_ACEOF
24861
-cat confdefs.h >>conftest.$ac_ext
24862
-cat >>conftest.$ac_ext <<_ACEOF
24863
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
24864
/* end confdefs.h. */
24866
/* Override any GCC internal prototype to avoid an error.
24867
@@ -5603,55 +4944,26 @@
24871
-rm -f conftest.$ac_objext conftest$ac_exeext
24872
-if { (ac_try="$ac_link"
24873
-case "(($ac_try" in
24874
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
24875
- *) ac_try_echo=$ac_try;;
24877
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
24878
-$as_echo "$ac_try_echo") >&5
24879
- (eval "$ac_link") 2>conftest.er1
24881
- grep -v '^ *+' conftest.er1 >conftest.err
24882
- rm -f conftest.er1
24883
- cat conftest.err >&5
24884
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
24885
- (exit $ac_status); } && {
24886
- test -z "$ac_c_werror_flag" ||
24887
- test ! -s conftest.err
24888
- } && test -s conftest$ac_exeext && {
24889
- test "$cross_compiling" = yes ||
24890
- $as_test_x conftest$ac_exeext
24892
+if ac_fn_c_try_link "$LINENO"; then :
24893
ac_cv_lib_intl_bindtextdomain=yes
24895
- $as_echo "$as_me: failed program was:" >&5
24896
-sed 's/^/| /' conftest.$ac_ext >&5
24898
- ac_cv_lib_intl_bindtextdomain=no
24899
+ ac_cv_lib_intl_bindtextdomain=no
24902
-rm -rf conftest.dSYM
24903
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
24904
- conftest$ac_exeext conftest.$ac_ext
24905
+rm -f core conftest.err conftest.$ac_objext \
24906
+ conftest$ac_exeext conftest.$ac_ext
24907
LIBS=$ac_check_lib_save_LIBS
24909
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
24910
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
24911
$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
24912
-if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then
24913
- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
24914
+if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
24915
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
24916
$as_echo_n "checking for ngettext in -lintl... " >&6; }
24917
-if test "${ac_cv_lib_intl_ngettext+set}" = set; then
24918
+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
24919
$as_echo_n "(cached) " >&6
24921
ac_check_lib_save_LIBS=$LIBS
24922
LIBS="-lintl $LIBS"
24923
-cat >conftest.$ac_ext <<_ACEOF
24926
-cat confdefs.h >>conftest.$ac_ext
24927
-cat >>conftest.$ac_ext <<_ACEOF
24928
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
24929
/* end confdefs.h. */
24931
/* Override any GCC internal prototype to avoid an error.
24932
@@ -5669,55 +4981,26 @@
24936
-rm -f conftest.$ac_objext conftest$ac_exeext
24937
-if { (ac_try="$ac_link"
24938
-case "(($ac_try" in
24939
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
24940
- *) ac_try_echo=$ac_try;;
24942
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
24943
-$as_echo "$ac_try_echo") >&5
24944
- (eval "$ac_link") 2>conftest.er1
24946
- grep -v '^ *+' conftest.er1 >conftest.err
24947
- rm -f conftest.er1
24948
- cat conftest.err >&5
24949
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
24950
- (exit $ac_status); } && {
24951
- test -z "$ac_c_werror_flag" ||
24952
- test ! -s conftest.err
24953
- } && test -s conftest$ac_exeext && {
24954
- test "$cross_compiling" = yes ||
24955
- $as_test_x conftest$ac_exeext
24957
+if ac_fn_c_try_link "$LINENO"; then :
24958
ac_cv_lib_intl_ngettext=yes
24960
- $as_echo "$as_me: failed program was:" >&5
24961
-sed 's/^/| /' conftest.$ac_ext >&5
24963
- ac_cv_lib_intl_ngettext=no
24964
+ ac_cv_lib_intl_ngettext=no
24967
-rm -rf conftest.dSYM
24968
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
24969
- conftest$ac_exeext conftest.$ac_ext
24970
+rm -f core conftest.err conftest.$ac_objext \
24971
+ conftest$ac_exeext conftest.$ac_ext
24972
LIBS=$ac_check_lib_save_LIBS
24974
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
24975
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
24976
$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
24977
-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
24978
- { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
24979
+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
24980
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
24981
$as_echo_n "checking for dgettext in -lintl... " >&6; }
24982
-if test "${ac_cv_lib_intl_dgettext+set}" = set; then
24983
+if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
24984
$as_echo_n "(cached) " >&6
24986
ac_check_lib_save_LIBS=$LIBS
24987
LIBS="-lintl $LIBS"
24988
-cat >conftest.$ac_ext <<_ACEOF
24991
-cat confdefs.h >>conftest.$ac_ext
24992
-cat >>conftest.$ac_ext <<_ACEOF
24993
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
24994
/* end confdefs.h. */
24996
/* Override any GCC internal prototype to avoid an error.
24997
@@ -5735,43 +5018,18 @@
25001
-rm -f conftest.$ac_objext conftest$ac_exeext
25002
-if { (ac_try="$ac_link"
25003
-case "(($ac_try" in
25004
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
25005
- *) ac_try_echo=$ac_try;;
25007
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
25008
-$as_echo "$ac_try_echo") >&5
25009
- (eval "$ac_link") 2>conftest.er1
25011
- grep -v '^ *+' conftest.er1 >conftest.err
25012
- rm -f conftest.er1
25013
- cat conftest.err >&5
25014
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
25015
- (exit $ac_status); } && {
25016
- test -z "$ac_c_werror_flag" ||
25017
- test ! -s conftest.err
25018
- } && test -s conftest$ac_exeext && {
25019
- test "$cross_compiling" = yes ||
25020
- $as_test_x conftest$ac_exeext
25022
+if ac_fn_c_try_link "$LINENO"; then :
25023
ac_cv_lib_intl_dgettext=yes
25025
- $as_echo "$as_me: failed program was:" >&5
25026
-sed 's/^/| /' conftest.$ac_ext >&5
25028
- ac_cv_lib_intl_dgettext=no
25029
+ ac_cv_lib_intl_dgettext=no
25032
-rm -rf conftest.dSYM
25033
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
25034
- conftest$ac_exeext conftest.$ac_ext
25035
+rm -f core conftest.err conftest.$ac_objext \
25036
+ conftest$ac_exeext conftest.$ac_ext
25037
LIBS=$ac_check_lib_save_LIBS
25039
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
25040
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
25041
$as_echo "$ac_cv_lib_intl_dgettext" >&6; }
25042
-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then
25043
+if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
25044
gt_cv_func_dgettext_libintl=yes
25047
@@ -5781,22 +5039,18 @@
25050
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
25051
- { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
25052
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5
25053
$as_echo_n "checking if -liconv is needed to use gettext... " >&6; }
25054
- { $as_echo "$as_me:$LINENO: result: " >&5
25055
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
25057
- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
25058
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
25059
$as_echo_n "checking for ngettext in -lintl... " >&6; }
25060
-if test "${ac_cv_lib_intl_ngettext+set}" = set; then
25061
+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
25062
$as_echo_n "(cached) " >&6
25064
ac_check_lib_save_LIBS=$LIBS
25065
LIBS="-lintl -liconv $LIBS"
25066
-cat >conftest.$ac_ext <<_ACEOF
25069
-cat confdefs.h >>conftest.$ac_ext
25070
-cat >>conftest.$ac_ext <<_ACEOF
25071
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
25072
/* end confdefs.h. */
25074
/* Override any GCC internal prototype to avoid an error.
25075
@@ -5814,55 +5068,26 @@
25079
-rm -f conftest.$ac_objext conftest$ac_exeext
25080
-if { (ac_try="$ac_link"
25081
-case "(($ac_try" in
25082
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
25083
- *) ac_try_echo=$ac_try;;
25085
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
25086
-$as_echo "$ac_try_echo") >&5
25087
- (eval "$ac_link") 2>conftest.er1
25089
- grep -v '^ *+' conftest.er1 >conftest.err
25090
- rm -f conftest.er1
25091
- cat conftest.err >&5
25092
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
25093
- (exit $ac_status); } && {
25094
- test -z "$ac_c_werror_flag" ||
25095
- test ! -s conftest.err
25096
- } && test -s conftest$ac_exeext && {
25097
- test "$cross_compiling" = yes ||
25098
- $as_test_x conftest$ac_exeext
25100
+if ac_fn_c_try_link "$LINENO"; then :
25101
ac_cv_lib_intl_ngettext=yes
25103
- $as_echo "$as_me: failed program was:" >&5
25104
-sed 's/^/| /' conftest.$ac_ext >&5
25106
- ac_cv_lib_intl_ngettext=no
25107
+ ac_cv_lib_intl_ngettext=no
25110
-rm -rf conftest.dSYM
25111
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
25112
- conftest$ac_exeext conftest.$ac_ext
25113
+rm -f core conftest.err conftest.$ac_objext \
25114
+ conftest$ac_exeext conftest.$ac_ext
25115
LIBS=$ac_check_lib_save_LIBS
25117
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
25118
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
25119
$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
25120
-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
25121
- { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
25122
+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
25123
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
25124
$as_echo_n "checking for dcgettext in -lintl... " >&6; }
25125
-if test "${ac_cv_lib_intl_dcgettext+set}" = set; then
25126
+if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :
25127
$as_echo_n "(cached) " >&6
25129
ac_check_lib_save_LIBS=$LIBS
25130
LIBS="-lintl -liconv $LIBS"
25131
-cat >conftest.$ac_ext <<_ACEOF
25134
-cat confdefs.h >>conftest.$ac_ext
25135
-cat >>conftest.$ac_ext <<_ACEOF
25136
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
25137
/* end confdefs.h. */
25139
/* Override any GCC internal prototype to avoid an error.
25140
@@ -5880,43 +5105,18 @@
25144
-rm -f conftest.$ac_objext conftest$ac_exeext
25145
-if { (ac_try="$ac_link"
25146
-case "(($ac_try" in
25147
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
25148
- *) ac_try_echo=$ac_try;;
25150
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
25151
-$as_echo "$ac_try_echo") >&5
25152
- (eval "$ac_link") 2>conftest.er1
25154
- grep -v '^ *+' conftest.er1 >conftest.err
25155
- rm -f conftest.er1
25156
- cat conftest.err >&5
25157
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
25158
- (exit $ac_status); } && {
25159
- test -z "$ac_c_werror_flag" ||
25160
- test ! -s conftest.err
25161
- } && test -s conftest$ac_exeext && {
25162
- test "$cross_compiling" = yes ||
25163
- $as_test_x conftest$ac_exeext
25165
+if ac_fn_c_try_link "$LINENO"; then :
25166
ac_cv_lib_intl_dcgettext=yes
25168
- $as_echo "$as_me: failed program was:" >&5
25169
-sed 's/^/| /' conftest.$ac_ext >&5
25171
- ac_cv_lib_intl_dcgettext=no
25172
+ ac_cv_lib_intl_dcgettext=no
25175
-rm -rf conftest.dSYM
25176
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
25177
- conftest$ac_exeext conftest.$ac_ext
25178
+rm -f core conftest.err conftest.$ac_objext \
25179
+ conftest$ac_exeext conftest.$ac_ext
25180
LIBS=$ac_check_lib_save_LIBS
25182
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
25183
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
25184
$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
25185
-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then
25186
+if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
25187
gt_cv_func_dgettext_libintl=yes
25188
libintl_extra_libs=-liconv
25190
@@ -5938,102 +5138,12 @@
25191
glib_save_LIBS="$LIBS"
25192
LIBS="$LIBS -lintl $libintl_extra_libs"
25193
unset ac_cv_func_bind_textdomain_codeset
25195
-for ac_func in bind_textdomain_codeset
25197
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
25198
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
25199
-$as_echo_n "checking for $ac_func... " >&6; }
25200
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
25201
- $as_echo_n "(cached) " >&6
25203
- cat >conftest.$ac_ext <<_ACEOF
25206
-cat confdefs.h >>conftest.$ac_ext
25207
-cat >>conftest.$ac_ext <<_ACEOF
25208
-/* end confdefs.h. */
25209
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
25210
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
25211
-#define $ac_func innocuous_$ac_func
25213
-/* System header to define __stub macros and hopefully few prototypes,
25214
- which can conflict with char $ac_func (); below.
25215
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
25216
- <limits.h> exists even on freestanding compilers. */
25219
-# include <limits.h>
25221
-# include <assert.h>
25226
-/* Override any GCC internal prototype to avoid an error.
25227
- Use char because int might match the return type of a GCC
25228
- builtin and then its argument prototype would still apply. */
25229
-#ifdef __cplusplus
25233
-/* The GNU C library defines this for functions which it implements
25234
- to always fail with ENOSYS. Some functions are actually named
25235
- something starting with __ and the normal name is an alias. */
25236
-#if defined __stub_$ac_func || defined __stub___$ac_func
25243
-return $ac_func ();
25248
-rm -f conftest.$ac_objext conftest$ac_exeext
25249
-if { (ac_try="$ac_link"
25250
-case "(($ac_try" in
25251
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
25252
- *) ac_try_echo=$ac_try;;
25254
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
25255
-$as_echo "$ac_try_echo") >&5
25256
- (eval "$ac_link") 2>conftest.er1
25258
- grep -v '^ *+' conftest.er1 >conftest.err
25259
- rm -f conftest.er1
25260
- cat conftest.err >&5
25261
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
25262
- (exit $ac_status); } && {
25263
- test -z "$ac_c_werror_flag" ||
25264
- test ! -s conftest.err
25265
- } && test -s conftest$ac_exeext && {
25266
- test "$cross_compiling" = yes ||
25267
- $as_test_x conftest$ac_exeext
25269
- eval "$as_ac_var=yes"
25271
- $as_echo "$as_me: failed program was:" >&5
25272
-sed 's/^/| /' conftest.$ac_ext >&5
25274
- eval "$as_ac_var=no"
25277
-rm -rf conftest.dSYM
25278
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
25279
- conftest$ac_exeext conftest.$ac_ext
25281
-ac_res=`eval 'as_val=${'$as_ac_var'}
25282
- $as_echo "$as_val"'`
25283
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
25284
-$as_echo "$ac_res" >&6; }
25285
-as_val=`eval 'as_val=${'$as_ac_var'}
25286
- $as_echo "$as_val"'`
25287
- if test "x$as_val" = x""yes; then
25288
+ for ac_func in bind_textdomain_codeset
25290
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
25291
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
25292
cat >>confdefs.h <<_ACEOF
25293
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
25294
+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
25298
@@ -6063,15 +5173,13 @@
25300
if test "$gt_cv_have_gettext" = "yes"; then
25302
-cat >>confdefs.h <<\_ACEOF
25303
-#define HAVE_GETTEXT 1
25305
+$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
25307
# Extract the first word of "msgfmt", so it can be a program name with args.
25308
set dummy msgfmt; ac_word=$2
25309
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
25310
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
25311
$as_echo_n "checking for $ac_word... " >&6; }
25312
-if test "${ac_cv_path_MSGFMT+set}" = set; then
25313
+if test "${ac_cv_path_MSGFMT+set}" = set; then :
25314
$as_echo_n "(cached) " >&6
25317
@@ -6096,118 +5204,28 @@
25319
MSGFMT="$ac_cv_path_MSGFMT"
25320
if test "$MSGFMT" != "no"; then
25321
- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
25322
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
25323
$as_echo "$MSGFMT" >&6; }
25325
- { $as_echo "$as_me:$LINENO: result: no" >&5
25326
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
25327
$as_echo "no" >&6; }
25329
if test "$MSGFMT" != "no"; then
25330
glib_save_LIBS="$LIBS"
25331
LIBS="$LIBS $INTLLIBS"
25333
-for ac_func in dcgettext
25335
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
25336
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
25337
-$as_echo_n "checking for $ac_func... " >&6; }
25338
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
25339
- $as_echo_n "(cached) " >&6
25341
- cat >conftest.$ac_ext <<_ACEOF
25344
-cat confdefs.h >>conftest.$ac_ext
25345
-cat >>conftest.$ac_ext <<_ACEOF
25346
-/* end confdefs.h. */
25347
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
25348
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
25349
-#define $ac_func innocuous_$ac_func
25351
-/* System header to define __stub macros and hopefully few prototypes,
25352
- which can conflict with char $ac_func (); below.
25353
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
25354
- <limits.h> exists even on freestanding compilers. */
25357
-# include <limits.h>
25359
-# include <assert.h>
25364
-/* Override any GCC internal prototype to avoid an error.
25365
- Use char because int might match the return type of a GCC
25366
- builtin and then its argument prototype would still apply. */
25367
-#ifdef __cplusplus
25371
-/* The GNU C library defines this for functions which it implements
25372
- to always fail with ENOSYS. Some functions are actually named
25373
- something starting with __ and the normal name is an alias. */
25374
-#if defined __stub_$ac_func || defined __stub___$ac_func
25381
-return $ac_func ();
25386
-rm -f conftest.$ac_objext conftest$ac_exeext
25387
-if { (ac_try="$ac_link"
25388
-case "(($ac_try" in
25389
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
25390
- *) ac_try_echo=$ac_try;;
25392
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
25393
-$as_echo "$ac_try_echo") >&5
25394
- (eval "$ac_link") 2>conftest.er1
25396
- grep -v '^ *+' conftest.er1 >conftest.err
25397
- rm -f conftest.er1
25398
- cat conftest.err >&5
25399
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
25400
- (exit $ac_status); } && {
25401
- test -z "$ac_c_werror_flag" ||
25402
- test ! -s conftest.err
25403
- } && test -s conftest$ac_exeext && {
25404
- test "$cross_compiling" = yes ||
25405
- $as_test_x conftest$ac_exeext
25407
- eval "$as_ac_var=yes"
25409
- $as_echo "$as_me: failed program was:" >&5
25410
-sed 's/^/| /' conftest.$ac_ext >&5
25412
- eval "$as_ac_var=no"
25415
-rm -rf conftest.dSYM
25416
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
25417
- conftest$ac_exeext conftest.$ac_ext
25419
-ac_res=`eval 'as_val=${'$as_ac_var'}
25420
- $as_echo "$as_val"'`
25421
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
25422
-$as_echo "$ac_res" >&6; }
25423
-as_val=`eval 'as_val=${'$as_ac_var'}
25424
- $as_echo "$as_val"'`
25425
- if test "x$as_val" = x""yes; then
25426
+ for ac_func in dcgettext
25428
+ ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
25429
+if test "x$ac_cv_func_dcgettext" = x""yes; then :
25430
cat >>confdefs.h <<_ACEOF
25431
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
25432
+#define HAVE_DCGETTEXT 1
25439
- { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
25440
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5
25441
$as_echo_n "checking if msgfmt accepts -c... " >&6; }
25442
cat >conftest.foo <<_ACEOF
25444
@@ -6222,14 +5240,14 @@
25445
"Content-Transfer-Encoding: 8bit\n"
25448
-if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
25449
+if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5
25450
($MSGFMT -c -o /dev/null conftest.foo) 2>&5
25452
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
25453
- (exit $ac_status); }; then
25454
- MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5
25455
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
25456
+ test $ac_status = 0; }; then
25457
+ MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
25458
$as_echo "yes" >&6; }
25459
-else { $as_echo "$as_me:$LINENO: result: no" >&5
25460
+else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
25461
$as_echo "no" >&6; }
25462
echo "$as_me: failed input was:" >&5
25463
sed 's/^/| /' conftest.foo >&5
25464
@@ -6237,9 +5255,9 @@
25466
# Extract the first word of "gmsgfmt", so it can be a program name with args.
25467
set dummy gmsgfmt; ac_word=$2
25468
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
25469
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
25470
$as_echo_n "checking for $ac_word... " >&6; }
25471
-if test "${ac_cv_path_GMSGFMT+set}" = set; then
25472
+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
25473
$as_echo_n "(cached) " >&6
25476
@@ -6252,14 +5270,14 @@
25479
test -z "$as_dir" && as_dir=.
25480
- for ac_exec_ext in '' $ac_executable_extensions; do
25481
+ for ac_exec_ext in '' $ac_executable_extensions; do
25482
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
25483
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
25484
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
25485
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
25493
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
25494
@@ -6268,19 +5286,19 @@
25496
GMSGFMT=$ac_cv_path_GMSGFMT
25497
if test -n "$GMSGFMT"; then
25498
- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
25499
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
25500
$as_echo "$GMSGFMT" >&6; }
25502
- { $as_echo "$as_me:$LINENO: result: no" >&5
25503
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
25504
$as_echo "no" >&6; }
25508
# Extract the first word of "xgettext", so it can be a program name with args.
25509
set dummy xgettext; ac_word=$2
25510
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
25511
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
25512
$as_echo_n "checking for $ac_word... " >&6; }
25513
-if test "${ac_cv_path_XGETTEXT+set}" = set; then
25514
+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
25515
$as_echo_n "(cached) " >&6
25517
case "$XGETTEXT" in
25518
@@ -6305,144 +5323,33 @@
25520
XGETTEXT="$ac_cv_path_XGETTEXT"
25521
if test "$XGETTEXT" != ":"; then
25522
- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
25523
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
25524
$as_echo "$XGETTEXT" >&6; }
25526
- { $as_echo "$as_me:$LINENO: result: no" >&5
25527
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
25528
$as_echo "no" >&6; }
25531
- cat >conftest.$ac_ext <<_ACEOF
25534
-cat confdefs.h >>conftest.$ac_ext
25535
-cat >>conftest.$ac_ext <<_ACEOF
25536
-/* end confdefs.h. */
25541
-extern int _nl_msg_cat_cntr;
25542
- return _nl_msg_cat_cntr
25547
-rm -f conftest.$ac_objext conftest$ac_exeext
25548
-if { (ac_try="$ac_link"
25549
-case "(($ac_try" in
25550
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
25551
- *) ac_try_echo=$ac_try;;
25553
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
25554
-$as_echo "$ac_try_echo") >&5
25555
- (eval "$ac_link") 2>conftest.er1
25557
- grep -v '^ *+' conftest.er1 >conftest.err
25558
- rm -f conftest.er1
25559
- cat conftest.err >&5
25560
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
25561
- (exit $ac_status); } && {
25562
- test -z "$ac_c_werror_flag" ||
25563
- test ! -s conftest.err
25564
- } && test -s conftest$ac_exeext && {
25565
- test "$cross_compiling" = yes ||
25566
- $as_test_x conftest$ac_exeext
25569
- DATADIRNAME=share
25571
- $as_echo "$as_me: failed program was:" >&5
25572
-sed 's/^/| /' conftest.$ac_ext >&5
25576
- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
25577
-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
25578
-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
25579
- $as_echo_n "(cached) " >&6
25581
- cat >conftest.$ac_ext <<_ACEOF
25584
-cat confdefs.h >>conftest.$ac_ext
25585
-cat >>conftest.$ac_ext <<_ACEOF
25586
-/* end confdefs.h. */
25587
-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
25588
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
25589
-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
25591
-/* System header to define __stub macros and hopefully few prototypes,
25592
- which can conflict with char bind_textdomain_codeset (); below.
25593
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
25594
- <limits.h> exists even on freestanding compilers. */
25597
-# include <limits.h>
25599
-# include <assert.h>
25602
-#undef bind_textdomain_codeset
25605
-/* Override any GCC internal prototype to avoid an error.
25606
- Use char because int might match the return type of a GCC
25607
- builtin and then its argument prototype would still apply. */
25608
-#ifdef __cplusplus
25611
-char bind_textdomain_codeset ();
25612
-/* The GNU C library defines this for functions which it implements
25613
- to always fail with ENOSYS. Some functions are actually named
25614
- something starting with __ and the normal name is an alias. */
25615
-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
25618
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
25619
+/* end confdefs.h. */
25624
-return bind_textdomain_codeset ();
25625
+extern int _nl_msg_cat_cntr;
25626
+ return _nl_msg_cat_cntr
25631
-rm -f conftest.$ac_objext conftest$ac_exeext
25632
-if { (ac_try="$ac_link"
25633
-case "(($ac_try" in
25634
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
25635
- *) ac_try_echo=$ac_try;;
25637
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
25638
-$as_echo "$ac_try_echo") >&5
25639
- (eval "$ac_link") 2>conftest.er1
25641
- grep -v '^ *+' conftest.er1 >conftest.err
25642
- rm -f conftest.er1
25643
- cat conftest.err >&5
25644
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
25645
- (exit $ac_status); } && {
25646
- test -z "$ac_c_werror_flag" ||
25647
- test ! -s conftest.err
25648
- } && test -s conftest$ac_exeext && {
25649
- test "$cross_compiling" = yes ||
25650
- $as_test_x conftest$ac_exeext
25652
- ac_cv_func_bind_textdomain_codeset=yes
25653
+if ac_fn_c_try_link "$LINENO"; then :
25655
+ DATADIRNAME=share
25657
- $as_echo "$as_me: failed program was:" >&5
25658
-sed 's/^/| /' conftest.$ac_ext >&5
25660
- ac_cv_func_bind_textdomain_codeset=no
25663
-rm -rf conftest.dSYM
25664
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
25665
- conftest$ac_exeext conftest.$ac_ext
25667
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
25668
-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
25669
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
25672
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
25673
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
25677
@@ -6457,10 +5364,8 @@
25682
-rm -rf conftest.dSYM
25683
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
25684
- conftest$ac_exeext conftest.$ac_ext
25685
+rm -f core conftest.err conftest.$ac_objext \
25686
+ conftest$ac_exeext conftest.$ac_ext
25687
LIBS="$glib_save_LIBS"
25690
@@ -6474,9 +5379,7 @@
25692
if test "$gt_cv_have_gettext" = "yes" ; then
25694
-cat >>confdefs.h <<\_ACEOF
25695
-#define ENABLE_NLS 1
25697
+$as_echo "#define ENABLE_NLS 1" >>confdefs.h
25701
@@ -6484,7 +5387,7 @@
25702
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
25705
- { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
25706
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
25707
$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
25710
@@ -6517,7 +5420,7 @@
25711
if test "x$ALL_LINGUAS" = "x"; then
25714
- { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
25715
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5
25716
$as_echo_n "checking for catalogs to be installed... " >&6; }
25718
for presentlang in $ALL_LINGUAS; do
25719
@@ -6542,7 +5445,7 @@
25722
LINGUAS=$NEW_LINGUAS
25723
- { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5
25724
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5
25725
$as_echo "$LINGUAS" >&6; }
25728
@@ -6588,21 +5491,21 @@
25729
themedir="\${datadir}/icons/gnome"
25732
-{ $as_echo "$as_me:$LINENO: checking development series build" >&5
25733
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking development series build" >&5
25734
$as_echo_n "checking development series build... " >&6; }
25735
DEVVERSION="`echo $PACKAGE_VERSION|cut -d. -f2`"
25736
if expr $DEVVERSION % 2 > /dev/null != "0"; then
25738
- { $as_echo "$as_me:$LINENO: result: yes" >&5
25739
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
25740
$as_echo "yes" >&6; }
25743
- { $as_echo "$as_me:$LINENO: result: no" >&5
25744
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
25745
$as_echo "no" >&6; }
25748
# Check whether --enable-icon-mapping was given.
25749
-if test "${enable_icon_mapping+set}" = set; then
25750
+if test "${enable_icon_mapping+set}" = set; then :
25751
enableval=$enable_icon_mapping; enable_mapping=$enableval
25753
enable_mapping=$mapenable
25754
@@ -6613,14 +5516,14 @@
25755
if test "x$enable_mapping" != "xno"; then
25756
UTILS_REQUIRED=0.8.7
25758
- { $as_echo "$as_me:$LINENO: checking icon-naming-utils >= $UTILS_REQUIRED" >&5
25759
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking icon-naming-utils >= $UTILS_REQUIRED" >&5
25760
$as_echo_n "checking icon-naming-utils >= $UTILS_REQUIRED... " >&6; }
25761
if test -n "$PKG_CONFIG" && \
25762
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"icon-naming-utils >= \$UTILS_REQUIRED\"") >&5
25763
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icon-naming-utils >= \$UTILS_REQUIRED\""; } >&5
25764
($PKG_CONFIG --exists --print-errors "icon-naming-utils >= $UTILS_REQUIRED") 2>&5
25766
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
25767
- (exit $ac_status); }; then
25768
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
25769
+ test $ac_status = 0; }; then
25773
@@ -6628,16 +5531,13 @@
25774
if test "x$have_utils" = "xyes"; then
25775
UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`"
25776
ICONMAP="$UTILS_PATH/icon-name-mapping"
25777
- { $as_echo "$as_me:$LINENO: result: yes" >&5
25778
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
25779
$as_echo "yes" >&6; }
25781
- { $as_echo "$as_me:$LINENO: result: no" >&5
25782
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
25783
$as_echo "no" >&6; }
25784
- { { $as_echo "$as_me:$LINENO: error: icon-naming-utils >= $UTILS_REQUIRED is required to build
25785
- and install gnome-icon-theme" >&5
25786
-$as_echo "$as_me: error: icon-naming-utils >= $UTILS_REQUIRED is required to build
25787
- and install gnome-icon-theme" >&2;}
25788
- { (exit 1); exit 1; }; }
25789
+ as_fn_error "icon-naming-utils >= $UTILS_REQUIRED is required to build
25790
+ and install gnome-icon-theme" "$LINENO" 5
25794
@@ -6672,13 +5572,13 @@
25798
- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
25799
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
25800
$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
25803
_ | IFS | as_nl) ;; #(
25804
BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
25805
- *) $as_unset $ac_var ;;
25806
+ *) { eval $ac_var=; unset $ac_var;} ;;
25810
@@ -6686,8 +5586,8 @@
25812
case $as_nl`(ac_space=' '; set) 2>&1` in #(
25813
*${as_nl}ac_space=\ *)
25814
- # `set' does not quote correctly, so add quotes (double-quote
25815
- # substitution turns \\\\ into \\, and sed turns \\ into \).
25816
+ # `set' does not quote correctly, so add quotes: double-quote
25817
+ # substitution turns \\\\ into \\, and sed turns \\ into \.
25820
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
25821
@@ -6710,11 +5610,11 @@
25822
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
25823
if test -w "$cache_file"; then
25824
test "x$cache_file" != "x/dev/null" &&
25825
- { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
25826
+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
25827
$as_echo "$as_me: updating cache $cache_file" >&6;}
25828
cat confcache >$cache_file
25830
- { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
25831
+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
25832
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
25835
@@ -6770,27 +5670,29 @@
25836
ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
25837
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
25838
# will be set to the directory where LIBOBJS objects are built.
25839
- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
25840
- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
25841
+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
25842
+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
25844
LIBOBJS=$ac_libobjs
25846
LTLIBOBJS=$ac_ltlibobjs
25849
+ if test -n "$EXEEXT"; then
25851
+ am__EXEEXT_FALSE='#'
25853
+ am__EXEEXT_TRUE='#'
25854
+ am__EXEEXT_FALSE=
25857
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
25858
- { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
25859
-Usually this means the macro was only invoked conditionally." >&5
25860
-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
25861
-Usually this means the macro was only invoked conditionally." >&2;}
25862
- { (exit 1); exit 1; }; }
25863
+ as_fn_error "conditional \"AMDEP\" was never defined.
25864
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
25866
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
25867
- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
25868
-Usually this means the macro was only invoked conditionally." >&5
25869
-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
25870
-Usually this means the macro was only invoked conditionally." >&2;}
25871
- { (exit 1); exit 1; }; }
25872
+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
25873
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
25876
ac_config_commands="$ac_config_commands po/stamp-it"
25877
@@ -6801,9 +5703,10 @@
25879
ac_clean_files_save=$ac_clean_files
25880
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
25881
-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
25882
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
25883
$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
25884
-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
25886
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
25888
# Generated by $as_me.
25889
# Run this file to recreate the current configuration.
25890
@@ -6813,17 +5716,18 @@
25892
ac_cs_recheck=false
25894
-SHELL=\${CONFIG_SHELL-$SHELL}
25897
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
25898
-## --------------------- ##
25899
-## M4sh Initialization. ##
25900
-## --------------------- ##
25901
+SHELL=\${CONFIG_SHELL-$SHELL}
25904
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
25905
+## -------------------- ##
25906
+## M4sh Initialization. ##
25907
+## -------------------- ##
25909
# Be more Bourne compatible
25910
DUALCASE=1; export DUALCASE # for MKS sh
25911
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
25912
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
25915
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
25916
@@ -6831,23 +5735,15 @@
25917
alias -g '${1+"$@"}'='"$@"'
25918
setopt NO_GLOB_SUBST
25920
- case `(set -o) 2>/dev/null` in
25921
- *posix*) set -o posix ;;
25922
+ case `(set -o) 2>/dev/null` in #(
25924
+ set -o posix ;; #(
25935
-# Avoid depending upon Character Ranges.
25936
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
25937
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
25938
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
25939
-as_cr_digits='0123456789'
25940
-as_cr_alnum=$as_cr_Letters$as_cr_digits
25945
@@ -6855,7 +5751,13 @@
25946
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
25947
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
25948
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
25949
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
25950
+# Prefer a ksh shell builtin over an external printf program on Solaris,
25951
+# but without wasting forks for bash or zsh.
25952
+if test -z "$BASH_VERSION$ZSH_VERSION" \
25953
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
25954
+ as_echo='print -r --'
25955
+ as_echo_n='print -rn --'
25956
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
25957
as_echo='printf %s\n'
25958
as_echo_n='printf %s'
25960
@@ -6866,7 +5768,7 @@
25961
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
25962
as_echo_n_body='eval
25967
expr "X$arg" : "X\\(.*\\)$as_nl";
25968
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
25969
@@ -6889,13 +5791,6 @@
25973
-# Support unset when possible.
25974
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
25982
# We need space, tab and new line, in precisely that order. Quoting is
25983
@@ -6905,15 +5800,15 @@
25986
# Find who we are. Look in the path if we contain no directory separator.
25989
*[\\/]* ) as_myself=$0 ;;
25990
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
25991
for as_dir in $PATH
25994
test -z "$as_dir" && as_dir=.
25995
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
25997
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
26002
@@ -6925,12 +5820,16 @@
26004
if test ! -f "$as_myself"; then
26005
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
26006
- { (exit 1); exit 1; }
26010
-# Work around bugs in pre-3.0 UWIN ksh.
26011
-for as_var in ENV MAIL MAILPATH
26012
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
26013
+# Unset variables that we do not need and which cause bugs (e.g. in
26014
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
26015
+# suppresses any "Segmentation fault" message there. '((' could
26016
+# trigger a bug in pdksh 5.2.14.
26017
+for as_var in BASH_ENV ENV MAIL MAILPATH
26018
+do eval test x\${$as_var+set} = xset \
26019
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
26023
@@ -6942,7 +5841,89 @@
26027
-# Required to use basename.
26029
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
26032
+# as_fn_error ERROR [LINENO LOG_FD]
26033
+# ---------------------------------
26034
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
26035
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
26036
+# script with status $?, using 1 if that was 0.
26039
+ as_status=$?; test $as_status -eq 0 && as_status=1
26040
+ if test "$3"; then
26041
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
26042
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
26044
+ $as_echo "$as_me: error: $1" >&2
26045
+ as_fn_exit $as_status
26049
+# as_fn_set_status STATUS
26050
+# -----------------------
26051
+# Set $? to STATUS, without forking.
26052
+as_fn_set_status ()
26055
+} # as_fn_set_status
26057
+# as_fn_exit STATUS
26058
+# -----------------
26059
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
26063
+ as_fn_set_status $1
26069
+# Portably unset VAR.
26072
+ { eval $1=; unset $1;}
26074
+as_unset=as_fn_unset
26075
+# as_fn_append VAR VALUE
26076
+# ----------------------
26077
+# Append the text in VALUE to the end of the definition contained in VAR. Take
26078
+# advantage of any shell optimizations that allow amortized linear growth over
26079
+# repeated appends, instead of the typical quadratic growth present in naive
26080
+# implementations.
26081
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
26082
+ eval 'as_fn_append ()
26093
+# as_fn_arith ARG...
26094
+# ------------------
26095
+# Perform arithmetic evaluation on the ARGs, and store the result in the
26096
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
26097
+# must be portable across $(()) and expr.
26098
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
26099
+ eval 'as_fn_arith ()
26106
+ as_val=`expr "$@" || test $? -eq 1`
26111
if expr a : '\(a\)' >/dev/null 2>&1 &&
26112
test "X`expr 00001 : '.*\(...\)'`" = X001; then
26114
@@ -6956,8 +5937,12 @@
26118
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
26119
+ as_dirname=dirname
26124
-# Name of the executable.
26125
as_me=`$as_basename -- "$0" ||
26126
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
26127
X"$0" : 'X\(//\)$' \| \
26128
@@ -6977,76 +5962,25 @@
26137
- as_lineno_1=$LINENO
26138
- as_lineno_2=$LINENO
26139
- test "x$as_lineno_1" != "x$as_lineno_2" &&
26140
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
26142
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
26143
- # uniformly replaced by the line number. The first 'sed' inserts a
26144
- # line-number line after each line using $LINENO; the second 'sed'
26145
- # does the real work. The second script uses 'N' to pair each
26146
- # line-number line with the line containing $LINENO, and appends
26147
- # trailing '-' during substitution so that $LINENO is not a special
26148
- # case at line end.
26149
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
26150
- # scripts with optimization help from Paolo Bonzini. Blame Lee
26151
- # E. McMahon (1931-1989) for sed's syntax. :-)
26157
- s/[$]LINENO.*/&-/
26163
- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
26166
- ' >$as_me.lineno &&
26167
- chmod +x "$as_me.lineno" ||
26168
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
26169
- { (exit 1); exit 1; }; }
26171
- # Don't try to exec as it changes $[0], causing all sort of problems
26172
- # (the dirname of $[0] is not the place where we might find the
26173
- # original and so on. Autoconf is especially sensitive to this).
26174
- . "./$as_me.lineno"
26175
- # Exit status is that of the last command.
26180
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
26181
- as_dirname=dirname
26185
+# Avoid depending upon Character Ranges.
26186
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
26187
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
26188
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
26189
+as_cr_digits='0123456789'
26190
+as_cr_alnum=$as_cr_Letters$as_cr_digits
26192
ECHO_C= ECHO_N= ECHO_T=
26193
-case `echo -n x` in
26194
+case `echo -n x` in #(((((
26196
- case `echo 'x\c'` in
26197
+ case `echo 'xy\c'` in
26198
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
26200
+ xy) ECHO_C='\c';;
26201
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
26207
-if expr a : '\(a\)' >/dev/null 2>&1 &&
26208
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
26214
rm -f conf$$ conf$$.exe conf$$.file
26215
if test -d conf$$.dir; then
26216
@@ -7075,8 +6009,56 @@
26217
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
26218
rmdir conf$$.dir 2>/dev/null
26223
+# Create "$as_dir" as a directory, including parents if necessary.
26227
+ case $as_dir in #(
26228
+ -*) as_dir=./$as_dir;;
26230
+ test -d "$as_dir" || eval $as_mkdir_p || {
26233
+ case $as_dir in #(
26234
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
26235
+ *) as_qdir=$as_dir;;
26237
+ as_dirs="'$as_qdir' $as_dirs"
26238
+ as_dir=`$as_dirname -- "$as_dir" ||
26239
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
26240
+ X"$as_dir" : 'X\(//\)[^/]' \| \
26241
+ X"$as_dir" : 'X\(//\)$' \| \
26242
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
26243
+$as_echo X"$as_dir" |
26244
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
26248
+ /^X\(\/\/\)[^/].*/{
26261
+ test -d "$as_dir" && break
26263
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
26264
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
26268
if mkdir -p . 2>/dev/null; then
26270
+ as_mkdir_p='mkdir -p "$as_dir"'
26272
test -d ./-p && rmdir ./-p
26274
@@ -7095,10 +6077,10 @@
26275
if test -d "$1"; then
26282
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
26283
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
26284
???[sx]*):;;*)false;;esac;fi
26287
@@ -7113,13 +6095,19 @@
26291
+## ----------------------------------- ##
26292
+## Main body of $CONFIG_STATUS script. ##
26293
+## ----------------------------------- ##
26295
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
26297
-# Save the log message, to keep $[0] and so on meaningful, and to
26298
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
26299
+# Save the log message, to keep $0 and so on meaningful, and to
26300
# report actual input values of CONFIG_FILES etc. instead of their
26301
# values after options handling.
26303
This file was extended by gnome-icon-theme $as_me 2.27.90, which was
26304
-generated by GNU Autoconf 2.63. Invocation command line was
26305
+generated by GNU Autoconf 2.64. Invocation command line was
26307
CONFIG_FILES = $CONFIG_FILES
26308
CONFIG_HEADERS = $CONFIG_HEADERS
26309
@@ -7147,10 +6135,11 @@
26311
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
26313
-\`$as_me' instantiates files from templates according to the
26314
-current configuration.
26315
+\`$as_me' instantiates files and other configuration actions
26316
+from templates according to the current configuration. Unless the files
26317
+and actions are specified as TAGs, all are instantiated by default.
26319
-Usage: $0 [OPTION]... [FILE]...
26320
+Usage: $0 [OPTION]... [TAG]...
26322
-h, --help print this help, then exit
26323
-V, --version print version number and configuration settings, then exit
26324
@@ -7167,16 +6156,16 @@
26325
Configuration commands:
26328
-Report bugs to <bug-autoconf@gnu.org>."
26329
+Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-icon-theme>."
26332
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
26334
gnome-icon-theme config.status 2.27.90
26335
-configured by $0, generated by GNU Autoconf 2.63,
26336
+configured by $0, generated by GNU Autoconf 2.64,
26337
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
26339
-Copyright (C) 2008 Free Software Foundation, Inc.
26340
+Copyright (C) 2009 Free Software Foundation, Inc.
26341
This config.status script is free software; the Free Software Foundation
26342
gives unlimited permission to copy, distribute and modify it."
26344
@@ -7219,7 +6208,7 @@
26346
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
26348
- CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
26349
+ as_fn_append CONFIG_FILES " '$ac_optarg'"
26350
ac_need_defaults=false;;
26351
--he | --h | --help | --hel | -h )
26352
$as_echo "$ac_cs_usage"; exit ;;
26353
@@ -7228,11 +6217,10 @@
26356
# This is an error.
26357
- -*) { $as_echo "$as_me: error: unrecognized option: $1
26358
-Try \`$0 --help' for more information." >&2
26359
- { (exit 1); exit 1; }; } ;;
26360
+ -*) as_fn_error "unrecognized option: \`$1'
26361
+Try \`$0 --help' for more information." ;;
26363
- *) ac_config_targets="$ac_config_targets $1"
26364
+ *) as_fn_append ac_config_targets " $1"
26365
ac_need_defaults=false ;;
26368
@@ -7396,9 +6384,7 @@
26369
"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
26370
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
26372
- *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
26373
-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
26374
- { (exit 1); exit 1; }; };;
26375
+ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
26379
@@ -7424,7 +6410,7 @@
26380
trap 'exit_status=$?
26381
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
26383
- trap '{ (exit 1); exit 1; }' 1 2 13 15
26384
+ trap 'as_fn_exit 1' 1 2 13 15
26386
# Create a (secure) tmp directory for tmp files.
26388
@@ -7435,11 +6421,7 @@
26390
tmp=./conf$$-$RANDOM
26391
(umask 077 && mkdir "$tmp")
26394
- $as_echo "$as_me: cannot create a temporary directory in ." >&2
26395
- { (exit 1); exit 1; }
26397
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
26399
# Set up the scripts for CONFIG_FILES section.
26400
# No need to generate them if there are no CONFIG_FILES.
26401
@@ -7447,10 +6429,16 @@
26402
if test -n "$CONFIG_FILES"; then
26406
+ac_cr=`echo X | tr X '\015'`
26407
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
26408
+# But we know of no other shell where ac_cr would be empty at this
26409
+# point, so we can use a bashism as a fallback.
26410
+if test "x$ac_cr" = x; then
26411
+ eval ac_cr=\$\'\\r\'
26413
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
26414
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
26415
- ac_cs_awk_cr='\\r'
26416
+ ac_cs_awk_cr='\r'
26418
ac_cs_awk_cr=$ac_cr
26420
@@ -7464,24 +6452,18 @@
26421
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
26423
} >conf$$subs.sh ||
26424
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
26425
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
26426
- { (exit 1); exit 1; }; }
26427
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
26428
ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
26430
for ac_last_try in false false false false false :; do
26431
. ./conf$$subs.sh ||
26432
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
26433
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
26434
- { (exit 1); exit 1; }; }
26435
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
26437
ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
26438
if test $ac_delim_n = $ac_delim_num; then
26440
elif $ac_last_try; then
26441
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
26442
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
26443
- { (exit 1); exit 1; }; }
26444
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
26446
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
26448
@@ -7570,9 +6552,7 @@
26451
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
26452
- || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
26453
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
26454
- { (exit 1); exit 1; }; }
26455
+ || as_fn_error "could not setup config files machinery" "$LINENO" 5
26458
# VPATH may cause trouble with some makes, so we remove $(srcdir),
26459
@@ -7603,9 +6583,7 @@
26461
case $ac_mode$ac_tag in
26463
- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
26464
-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
26465
- { (exit 1); exit 1; }; };;
26466
+ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
26467
:[FH]-) ac_tag=-:-;;
26468
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
26470
@@ -7633,12 +6611,10 @@
26472
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
26474
- { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
26475
-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
26476
- { (exit 1); exit 1; }; };;
26477
+ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
26479
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
26480
- ac_file_inputs="$ac_file_inputs '$ac_f'"
26481
+ as_fn_append ac_file_inputs " '$ac_f'"
26484
# Let's still pretend it is `configure' which instantiates (i.e., don't
26485
@@ -7649,7 +6625,7 @@
26487
if test x"$ac_file" != x-; then
26488
configure_input="$ac_file. $configure_input"
26489
- { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
26490
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
26491
$as_echo "$as_me: creating $ac_file" >&6;}
26493
# Neutralize special characters interpreted by sed in replacement strings.
26494
@@ -7662,9 +6638,7 @@
26497
*:-:* | *:-) cat >"$tmp/stdin" \
26498
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
26499
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
26500
- { (exit 1); exit 1; }; } ;;
26501
+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
26505
@@ -7692,47 +6666,7 @@
26509
- { as_dir="$ac_dir"
26510
- case $as_dir in #(
26511
- -*) as_dir=./$as_dir;;
26513
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
26516
- case $as_dir in #(
26517
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
26518
- *) as_qdir=$as_dir;;
26520
- as_dirs="'$as_qdir' $as_dirs"
26521
- as_dir=`$as_dirname -- "$as_dir" ||
26522
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
26523
- X"$as_dir" : 'X\(//\)[^/]' \| \
26524
- X"$as_dir" : 'X\(//\)$' \| \
26525
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
26526
-$as_echo X"$as_dir" |
26527
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
26531
- /^X\(\/\/\)[^/].*/{
26544
- test -d "$as_dir" && break
26546
- test -z "$as_dirs" || eval "mkdir $as_dirs"
26547
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
26548
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
26549
- { (exit 1); exit 1; }; }; }
26550
+ as_dir="$ac_dir"; as_fn_mkdir_p
26554
@@ -7789,7 +6723,6 @@
26555
# If the template does not know about datarootdir, expand it.
26556
# FIXME: This hack should be removed a few years after 2.60.
26557
ac_datarootdir_hack=; ac_datarootdir_seen=
26562
@@ -7799,12 +6732,11 @@
26569
case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
26570
*datarootdir*) ac_datarootdir_seen=yes;;
26571
*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
26572
- { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
26573
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
26574
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
26576
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
26577
@@ -7814,7 +6746,7 @@
26578
s&@infodir@&$infodir&g
26579
s&@localedir@&$localedir&g
26580
s&@mandir@&$mandir&g
26581
- s&\\\${datarootdir}&$datarootdir&g' ;;
26582
+ s&\\\${datarootdir}&$datarootdir&g' ;;
26586
@@ -7843,14 +6775,12 @@
26587
$ac_datarootdir_hack
26589
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
26590
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
26591
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
26592
- { (exit 1); exit 1; }; }
26593
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
26595
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
26596
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
26597
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
26598
- { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
26599
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
26600
which seems to be undefined. Please make sure it is defined." >&5
26601
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
26602
which seems to be undefined. Please make sure it is defined." >&2;}
26603
@@ -7860,13 +6790,11 @@
26604
-) cat "$tmp/out" && rm -f "$tmp/out";;
26605
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
26607
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
26608
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
26609
- { (exit 1); exit 1; }; }
26610
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
26614
- :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
26615
+ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
26616
$as_echo "$as_me: executing $ac_file commands" >&6;}
26619
@@ -7961,47 +6889,7 @@
26623
- { as_dir=$dirpart/$fdir
26624
- case $as_dir in #(
26625
- -*) as_dir=./$as_dir;;
26627
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
26630
- case $as_dir in #(
26631
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
26632
- *) as_qdir=$as_dir;;
26634
- as_dirs="'$as_qdir' $as_dirs"
26635
- as_dir=`$as_dirname -- "$as_dir" ||
26636
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
26637
- X"$as_dir" : 'X\(//\)[^/]' \| \
26638
- X"$as_dir" : 'X\(//\)$' \| \
26639
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
26640
-$as_echo X"$as_dir" |
26641
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
26645
- /^X\(\/\/\)[^/].*/{
26658
- test -d "$as_dir" && break
26660
- test -z "$as_dirs" || eval "mkdir $as_dirs"
26661
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
26662
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
26663
- { (exit 1); exit 1; }; }; }
26664
+ as_dir=$dirpart/$fdir; as_fn_mkdir_p
26665
# echo "creating $dirpart/$file"
26666
echo '# dummy' > "$dirpart/$file"
26668
@@ -8013,9 +6901,7 @@
26671
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
26672
- { { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5
26673
-$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;}
26674
- { (exit 1); exit 1; }; }
26675
+ as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
26677
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
26679
@@ -8038,15 +6924,12 @@
26683
-{ (exit 0); exit 0; }
26686
-chmod +x $CONFIG_STATUS
26687
ac_clean_files=$ac_clean_files_save
26689
test $ac_write_fail = 0 ||
26690
- { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
26691
-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
26692
- { (exit 1); exit 1; }; }
26693
+ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
26696
# configure is writing to config.log, and then calls config.status.
26697
@@ -8067,10 +6950,10 @@
26699
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
26700
# would make configure fail if this is the last instruction.
26701
- $ac_cs_success || { (exit 1); exit 1; }
26702
+ $ac_cs_success || as_fn_exit $?
26704
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
26705
- { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
26706
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
26707
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
26710
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/Makefile.in gnome-icon-theme-2.27.90.new/Makefile.in
26711
--- gnome-icon-theme-2.27.90/Makefile.in 2009-08-13 03:45:54.000000000 +0200
26712
+++ gnome-icon-theme-2.27.90.new/Makefile.in 2009-08-27 12:38:32.000000000 +0200
26714
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
26715
+# Makefile.in generated by automake 1.11 from Makefile.am.
26716
# @configure_input@
26718
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
26719
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
26720
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
26722
# This Makefile.in is free software; the Free Software Foundation
26723
# gives unlimited permission to copy and/or distribute it,
26724
# with or without modifications, as long as this notice is preserved.
26728
pkgdatadir = $(datadir)/@PACKAGE@
26729
-pkglibdir = $(libdir)/@PACKAGE@
26730
pkgincludedir = $(includedir)/@PACKAGE@
26731
+pkglibdir = $(libdir)/@PACKAGE@
26732
+pkglibexecdir = $(libexecdir)/@PACKAGE@
26733
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
26734
install_sh_DATA = $(install_sh) -c -m 644
26735
install_sh_PROGRAM = $(install_sh) -c
26737
configure.lineno config.status.lineno
26738
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
26739
CONFIG_CLEAN_FILES = gnome-icon-theme.pc
26740
+CONFIG_CLEAN_VPATH_FILES =
26743
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
26744
@@ -57,13 +60,29 @@
26745
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
26748
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
26749
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
26750
+am__install_max = 40
26751
+am__nobase_strip_setup = \
26752
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
26753
+am__nobase_strip = \
26754
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
26755
+am__nobase_list = $(am__nobase_strip_setup); \
26756
+ for p in $$list; do echo "$$p $$p"; done | \
26757
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
26758
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
26759
+ if (++n[$$2] == $(am__install_max)) \
26760
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
26761
+ END { for (dir in files) print dir, files[dir] }'
26763
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
26764
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
26765
am__installdirs = "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(themedir)"
26766
-pkgconfigDATA_INSTALL = $(INSTALL_DATA)
26767
-themeDATA_INSTALL = $(INSTALL_DATA)
26768
DATA = $(pkgconfig_DATA) $(theme_DATA)
26769
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
26770
distclean-recursive maintainer-clean-recursive
26771
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
26772
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
26773
+ distdir dist dist-all distcheck
26776
DIST_SUBDIRS = $(SUBDIRS)
26778
distdir = $(PACKAGE)-$(VERSION)
26779
top_distdir = $(distdir)
26780
am__remove_distdir = \
26781
- { test ! -d $(distdir) \
26782
- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
26783
- && rm -fr $(distdir); }; }
26784
+ { test ! -d "$(distdir)" \
26785
+ || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
26786
+ && rm -fr "$(distdir)"; }; }
26787
+am__relativize = \
26789
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
26790
+ sed_rest='s,^[^/]*/*,,'; \
26791
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
26792
+ sed_butlast='s,/*[^/]*$$,,'; \
26793
+ while test -n "$$dir1"; do \
26794
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
26795
+ if test "$$first" != "."; then \
26796
+ if test "$$first" = ".."; then \
26797
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
26798
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
26800
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
26801
+ if test "$$first2" = "$$first"; then \
26802
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
26804
+ dir2="../$$dir2"; \
26806
+ dir0="$$dir0"/"$$first"; \
26809
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
26812
DIST_ARCHIVES = $(distdir).tar.gz
26814
distuninstallcheck_listfiles = find . -type f -print
26815
@@ -134,6 +178,7 @@
26816
PACKAGE_NAME = @PACKAGE_NAME@
26817
PACKAGE_STRING = @PACKAGE_STRING@
26818
PACKAGE_TARNAME = @PACKAGE_TARNAME@
26819
+PACKAGE_URL = @PACKAGE_URL@
26820
PACKAGE_VERSION = @PACKAGE_VERSION@
26821
PATH_SEPARATOR = @PATH_SEPARATOR@
26822
PKG_CONFIG = @PKG_CONFIG@
26823
@@ -220,15 +265,15 @@
26824
@for dep in $?; do \
26825
case '$(am__configure_deps)' in \
26827
- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
26828
- cd $(srcdir) && $(AUTOMAKE) --gnu \
26829
+ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
26830
+ $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
26835
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
26836
- cd $(top_srcdir) && \
26837
- $(AUTOMAKE) --gnu Makefile
26838
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
26839
+ $(am__cd) $(top_srcdir) && \
26840
+ $(AUTOMAKE) --gnu Makefile
26841
.PRECIOUS: Makefile
26842
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
26844
@@ -244,45 +289,52 @@
26845
$(SHELL) ./config.status --recheck
26847
$(top_srcdir)/configure: $(am__configure_deps)
26848
- cd $(srcdir) && $(AUTOCONF)
26849
+ $(am__cd) $(srcdir) && $(AUTOCONF)
26850
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
26851
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
26852
+ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
26853
+$(am__aclocal_m4_deps):
26854
gnome-icon-theme.pc: $(top_builddir)/config.status $(srcdir)/gnome-icon-theme.pc.in
26855
cd $(top_builddir) && $(SHELL) ./config.status $@
26856
install-pkgconfigDATA: $(pkgconfig_DATA)
26858
test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
26859
- @list='$(pkgconfig_DATA)'; for p in $$list; do \
26860
+ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
26861
+ for p in $$list; do \
26862
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
26863
- f=$(am__strip_dir) \
26864
- echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
26865
- $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
26867
+ done | $(am__base_list) | \
26868
+ while read files; do \
26869
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
26870
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
26873
uninstall-pkgconfigDATA:
26874
@$(NORMAL_UNINSTALL)
26875
- @list='$(pkgconfig_DATA)'; for p in $$list; do \
26876
- f=$(am__strip_dir) \
26877
- echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
26878
- rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
26880
+ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
26881
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
26882
+ test -n "$$files" || exit 0; \
26883
+ echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
26884
+ cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
26885
install-themeDATA: $(theme_DATA)
26887
test -z "$(themedir)" || $(MKDIR_P) "$(DESTDIR)$(themedir)"
26888
- @list='$(theme_DATA)'; for p in $$list; do \
26889
+ @list='$(theme_DATA)'; test -n "$(themedir)" || list=; \
26890
+ for p in $$list; do \
26891
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
26892
- f=$(am__strip_dir) \
26893
- echo " $(themeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themedir)/$$f'"; \
26894
- $(themeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themedir)/$$f"; \
26896
+ done | $(am__base_list) | \
26897
+ while read files; do \
26898
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(themedir)'"; \
26899
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(themedir)" || exit $$?; \
26902
uninstall-themeDATA:
26903
@$(NORMAL_UNINSTALL)
26904
- @list='$(theme_DATA)'; for p in $$list; do \
26905
- f=$(am__strip_dir) \
26906
- echo " rm -f '$(DESTDIR)$(themedir)/$$f'"; \
26907
- rm -f "$(DESTDIR)$(themedir)/$$f"; \
26909
+ @list='$(theme_DATA)'; test -n "$(themedir)" || list=; \
26910
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
26911
+ test -n "$$files" || exit 0; \
26912
+ echo " ( cd '$(DESTDIR)$(themedir)' && rm -f" $$files ")"; \
26913
+ cd "$(DESTDIR)$(themedir)" && rm -f $$files
26915
# This directory's subdirectories are mostly independent; you can cd
26916
# into them and run `make' without going through this Makefile.
26917
@@ -308,7 +360,7 @@
26919
local_target="$$target"; \
26921
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
26922
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
26923
|| eval $$failcom; \
26925
if test "$$dot_seen" = "no"; then \
26926
@@ -342,16 +394,16 @@
26928
local_target="$$target"; \
26930
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
26931
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
26932
|| eval $$failcom; \
26933
done && test -z "$$fail"
26935
list='$(SUBDIRS)'; for subdir in $$list; do \
26936
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
26937
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
26940
list='$(SUBDIRS)'; for subdir in $$list; do \
26941
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
26942
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
26945
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
26946
@@ -366,7 +418,7 @@
26948
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
26949
$(TAGS_FILES) $(LISP)
26953
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
26954
include_option=--etags-include; \
26955
@@ -378,7 +430,7 @@
26956
list='$(SUBDIRS)'; for subdir in $$list; do \
26957
if test "$$subdir" = .; then :; else \
26958
test ! -f $$subdir/TAGS || \
26959
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
26960
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
26963
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
26964
@@ -387,36 +439,41 @@
26966
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
26967
END { if (nonempty) { for (i in files) print i; }; }'`; \
26968
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
26970
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
26971
test -n "$$unique" || unique=$$empty_fix; \
26972
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
26973
- $$tags $$unique; \
26974
+ if test $$# -gt 0; then \
26975
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
26976
+ "$$@" $$unique; \
26978
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
26983
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
26984
$(TAGS_FILES) $(LISP)
26986
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
26987
unique=`for i in $$list; do \
26988
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
26990
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
26991
END { if (nonempty) { for (i in files) print i; }; }'`; \
26992
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
26993
+ test -z "$(CTAGS_ARGS)$$unique" \
26994
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
26999
here=`$(am__cd) $(top_builddir) && pwd` \
27000
- && cd $(top_srcdir) \
27001
- && gtags -i $(GTAGS_ARGS) $$here
27002
+ && $(am__cd) $(top_srcdir) \
27003
+ && gtags -i $(GTAGS_ARGS) "$$here"
27006
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
27008
distdir: $(DISTFILES)
27009
$(am__remove_distdir)
27010
- test -d $(distdir) || mkdir $(distdir)
27011
+ test -d "$(distdir)" || mkdir "$(distdir)"
27012
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
27013
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
27014
list='$(DISTFILES)'; \
27015
@@ -432,38 +489,54 @@
27016
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
27017
if test -d $$d/$$file; then \
27018
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
27019
+ if test -d "$(distdir)/$$file"; then \
27020
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
27022
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
27023
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
27024
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
27025
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
27027
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
27028
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
27030
- test -f $(distdir)/$$file \
27031
- || cp -p $$d/$$file $(distdir)/$$file \
27032
+ test -f "$(distdir)/$$file" \
27033
+ || cp -p $$d/$$file "$(distdir)/$$file" \
27037
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
27038
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
27039
if test "$$subdir" = .; then :; else \
27040
test -d "$(distdir)/$$subdir" \
27041
|| $(MKDIR_P) "$(distdir)/$$subdir" \
27043
- distdir=`$(am__cd) $(distdir) && pwd`; \
27044
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
27045
- (cd $$subdir && \
27048
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
27049
+ if test "$$subdir" = .; then :; else \
27050
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
27051
+ $(am__relativize); \
27052
+ new_distdir=$$reldir; \
27053
+ dir1=$$subdir; dir2="$(top_distdir)"; \
27054
+ $(am__relativize); \
27055
+ new_top_distdir=$$reldir; \
27056
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
27057
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
27058
+ ($(am__cd) $$subdir && \
27059
$(MAKE) $(AM_MAKEFLAGS) \
27060
- top_distdir="$$top_distdir" \
27061
- distdir="$$distdir/$$subdir" \
27062
+ top_distdir="$$new_top_distdir" \
27063
+ distdir="$$new_distdir" \
27064
am__remove_distdir=: \
27065
am__skip_length_check=: \
27066
+ am__skip_mode_fix=: \
27071
- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
27072
+ -test -n "$(am__skip_mode_fix)" \
27073
+ || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
27074
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
27075
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
27076
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
27077
- || chmod -R a+r $(distdir)
27078
+ || chmod -R a+r "$(distdir)"
27080
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
27081
$(am__remove_distdir)
27082
@@ -476,6 +549,10 @@
27083
tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
27084
$(am__remove_distdir)
27087
+ tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
27088
+ $(am__remove_distdir)
27091
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
27092
$(am__remove_distdir)
27093
@@ -504,6 +581,8 @@
27094
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
27096
unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
27098
+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\
27100
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
27102
@@ -515,9 +594,11 @@
27103
mkdir $(distdir)/_build
27104
mkdir $(distdir)/_inst
27105
chmod a-w $(distdir)
27106
+ test -d $(distdir)/_build || exit 0; \
27107
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
27108
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
27109
- && cd $(distdir)/_build \
27110
+ && am__cwd=`pwd` \
27111
+ && $(am__cd) $(distdir)/_build \
27112
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
27113
$(DISTCHECK_CONFIGURE_FLAGS) \
27114
&& $(MAKE) $(AM_MAKEFLAGS) \
27115
@@ -539,13 +620,15 @@
27116
&& rm -rf "$$dc_destdir" \
27117
&& $(MAKE) $(AM_MAKEFLAGS) dist \
27118
&& rm -rf $(DIST_ARCHIVES) \
27119
- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
27120
+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
27121
+ && cd "$$am__cwd" \
27123
$(am__remove_distdir)
27124
@(echo "$(distdir) archives ready for distribution: "; \
27125
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
27126
sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
27127
distuninstallcheck:
27128
- @cd $(distuninstallcheck_dir) \
27129
+ @$(am__cd) '$(distuninstallcheck_dir)' \
27130
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
27131
|| { echo "ERROR: files left after uninstall:" ; \
27132
if test -n "$(DESTDIR)"; then \
27133
@@ -591,6 +674,7 @@
27136
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
27137
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
27139
maintainer-clean-generic:
27140
@echo "This command is intended for maintainers to use"
27141
@@ -611,6 +695,8 @@
27143
html: html-recursive
27147
info: info-recursive
27150
@@ -620,18 +706,28 @@
27152
install-dvi: install-dvi-recursive
27158
install-html: install-html-recursive
27162
install-info: install-info-recursive
27168
install-pdf: install-pdf-recursive
27172
install-ps: install-ps-recursive
27178
maintainer-clean: maintainer-clean-recursive
27179
@@ -654,16 +750,16 @@
27181
uninstall-am: uninstall-pkgconfigDATA uninstall-themeDATA
27183
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
27185
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
27186
+ install-am install-strip tags-recursive
27188
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
27189
all all-am am--refresh check check-am clean clean-generic \
27190
ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
27191
- dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \
27192
- distclean-generic distclean-tags distcleancheck distdir \
27193
- distuninstallcheck dvi dvi-am html html-am info info-am \
27194
- install install-am install-data install-data-am \
27195
+ dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \
27196
+ distclean distclean-generic distclean-tags distcleancheck \
27197
+ distdir distuninstallcheck dvi dvi-am html html-am info \
27198
+ info-am install install-am install-data install-data-am \
27199
install-data-local install-dvi install-dvi-am install-exec \
27200
install-exec-am install-html install-html-am install-info \
27201
install-info-am install-man install-pdf install-pdf-am \
27202
@@ -681,6 +777,7 @@
27204
install-data-local:
27205
$(MAKE) -C po uninstall
27207
# Tell versions [3.59,3.63) of GNU make to not export all variables.
27208
# Otherwise a system limit (for SysV at least) may be exceeded.
27210
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/scalable/actions/Makefile.in gnome-icon-theme-2.27.90.new/scalable/actions/Makefile.in
27211
--- gnome-icon-theme-2.27.90/scalable/actions/Makefile.in 2009-08-13 03:45:51.000000000 +0200
27212
+++ gnome-icon-theme-2.27.90.new/scalable/actions/Makefile.in 2009-08-27 12:38:31.000000000 +0200
27214
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
27215
+# Makefile.in generated by automake 1.11 from Makefile.am.
27216
# @configure_input@
27218
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
27219
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
27220
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
27222
# This Makefile.in is free software; the Free Software Foundation
27223
# gives unlimited permission to copy and/or distribute it,
27224
# with or without modifications, as long as this notice is preserved.
27228
pkgdatadir = $(datadir)/@PACKAGE@
27229
-pkglibdir = $(libdir)/@PACKAGE@
27230
pkgincludedir = $(includedir)/@PACKAGE@
27231
+pkglibdir = $(libdir)/@PACKAGE@
27232
+pkglibexecdir = $(libexecdir)/@PACKAGE@
27233
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
27234
install_sh_DATA = $(install_sh) -c -m 644
27235
install_sh_PROGRAM = $(install_sh) -c
27238
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
27239
CONFIG_CLEAN_FILES =
27240
+CONFIG_CLEAN_VPATH_FILES =
27243
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
27245
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
27248
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
27249
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
27250
+am__install_max = 40
27251
+am__nobase_strip_setup = \
27252
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
27253
+am__nobase_strip = \
27254
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
27255
+am__nobase_list = $(am__nobase_strip_setup); \
27256
+ for p in $$list; do echo "$$p $$p"; done | \
27257
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
27258
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
27259
+ if (++n[$$2] == $(am__install_max)) \
27260
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
27261
+ END { for (dir in files) print dir, files[dir] }'
27263
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
27264
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
27265
am__installdirs = "$(DESTDIR)$(iconsdir)"
27266
-iconsDATA_INSTALL = $(INSTALL_DATA)
27267
DATA = $(icons_DATA)
27268
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
27269
ACLOCAL = @ACLOCAL@
27270
@@ -106,6 +123,7 @@
27271
PACKAGE_NAME = @PACKAGE_NAME@
27272
PACKAGE_STRING = @PACKAGE_STRING@
27273
PACKAGE_TARNAME = @PACKAGE_TARNAME@
27274
+PACKAGE_URL = @PACKAGE_URL@
27275
PACKAGE_VERSION = @PACKAGE_VERSION@
27276
PATH_SEPARATOR = @PATH_SEPARATOR@
27277
PKG_CONFIG = @PKG_CONFIG@
27278
@@ -285,9 +303,9 @@
27282
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu scalable/actions/Makefile'; \
27283
- cd $(top_srcdir) && \
27284
- $(AUTOMAKE) --gnu scalable/actions/Makefile
27285
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu scalable/actions/Makefile'; \
27286
+ $(am__cd) $(top_srcdir) && \
27287
+ $(AUTOMAKE) --gnu scalable/actions/Makefile
27288
.PRECIOUS: Makefile
27289
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
27291
@@ -305,23 +323,27 @@
27292
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
27293
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
27294
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
27295
+$(am__aclocal_m4_deps):
27296
install-iconsDATA: $(icons_DATA)
27298
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
27299
- @list='$(icons_DATA)'; for p in $$list; do \
27300
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
27301
+ for p in $$list; do \
27302
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
27303
- f=$(am__strip_dir) \
27304
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
27305
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
27307
+ done | $(am__base_list) | \
27308
+ while read files; do \
27309
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
27310
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
27313
uninstall-iconsDATA:
27314
@$(NORMAL_UNINSTALL)
27315
- @list='$(icons_DATA)'; for p in $$list; do \
27316
- f=$(am__strip_dir) \
27317
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
27318
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
27320
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
27321
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
27322
+ test -n "$$files" || exit 0; \
27323
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
27324
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
27328
@@ -345,13 +367,17 @@
27329
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
27330
if test -d $$d/$$file; then \
27331
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
27332
+ if test -d "$(distdir)/$$file"; then \
27333
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
27335
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
27336
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
27337
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
27338
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
27340
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
27341
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
27343
- test -f $(distdir)/$$file \
27344
- || cp -p $$d/$$file $(distdir)/$$file \
27345
+ test -f "$(distdir)/$$file" \
27346
+ || cp -p $$d/$$file "$(distdir)/$$file" \
27350
@@ -382,6 +408,7 @@
27353
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
27354
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
27356
maintainer-clean-generic:
27357
@echo "This command is intended for maintainers to use"
27358
@@ -401,6 +428,8 @@
27367
@@ -409,18 +438,28 @@
27369
install-dvi: install-dvi-am
27375
install-html: install-html-am
27379
install-info: install-info-am
27385
install-pdf: install-pdf-am
27389
install-ps: install-ps-am
27395
maintainer-clean: maintainer-clean-am
27396
@@ -476,6 +515,7 @@
27401
# Tell versions [3.59,3.63) of GNU make to not export all variables.
27402
# Otherwise a system limit (for SysV at least) may be exceeded.
27404
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/scalable/apps/Makefile.in gnome-icon-theme-2.27.90.new/scalable/apps/Makefile.in
27405
--- gnome-icon-theme-2.27.90/scalable/apps/Makefile.in 2009-08-13 03:45:52.000000000 +0200
27406
+++ gnome-icon-theme-2.27.90.new/scalable/apps/Makefile.in 2009-08-27 12:38:32.000000000 +0200
27408
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
27409
+# Makefile.in generated by automake 1.11 from Makefile.am.
27410
# @configure_input@
27412
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
27413
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
27414
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
27416
# This Makefile.in is free software; the Free Software Foundation
27417
# gives unlimited permission to copy and/or distribute it,
27418
# with or without modifications, as long as this notice is preserved.
27422
pkgdatadir = $(datadir)/@PACKAGE@
27423
-pkglibdir = $(libdir)/@PACKAGE@
27424
pkgincludedir = $(includedir)/@PACKAGE@
27425
+pkglibdir = $(libdir)/@PACKAGE@
27426
+pkglibexecdir = $(libexecdir)/@PACKAGE@
27427
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
27428
install_sh_DATA = $(install_sh) -c -m 644
27429
install_sh_PROGRAM = $(install_sh) -c
27432
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
27433
CONFIG_CLEAN_FILES =
27434
+CONFIG_CLEAN_VPATH_FILES =
27437
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
27439
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
27442
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
27443
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
27444
+am__install_max = 40
27445
+am__nobase_strip_setup = \
27446
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
27447
+am__nobase_strip = \
27448
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
27449
+am__nobase_list = $(am__nobase_strip_setup); \
27450
+ for p in $$list; do echo "$$p $$p"; done | \
27451
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
27452
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
27453
+ if (++n[$$2] == $(am__install_max)) \
27454
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
27455
+ END { for (dir in files) print dir, files[dir] }'
27457
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
27458
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
27459
am__installdirs = "$(DESTDIR)$(iconsdir)"
27460
-iconsDATA_INSTALL = $(INSTALL_DATA)
27461
DATA = $(icons_DATA)
27462
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
27463
ACLOCAL = @ACLOCAL@
27464
@@ -106,6 +123,7 @@
27465
PACKAGE_NAME = @PACKAGE_NAME@
27466
PACKAGE_STRING = @PACKAGE_STRING@
27467
PACKAGE_TARNAME = @PACKAGE_TARNAME@
27468
+PACKAGE_URL = @PACKAGE_URL@
27469
PACKAGE_VERSION = @PACKAGE_VERSION@
27470
PATH_SEPARATOR = @PATH_SEPARATOR@
27471
PKG_CONFIG = @PKG_CONFIG@
27472
@@ -216,9 +234,9 @@
27476
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu scalable/apps/Makefile'; \
27477
- cd $(top_srcdir) && \
27478
- $(AUTOMAKE) --gnu scalable/apps/Makefile
27479
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu scalable/apps/Makefile'; \
27480
+ $(am__cd) $(top_srcdir) && \
27481
+ $(AUTOMAKE) --gnu scalable/apps/Makefile
27482
.PRECIOUS: Makefile
27483
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
27485
@@ -236,23 +254,27 @@
27486
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
27487
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
27488
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
27489
+$(am__aclocal_m4_deps):
27490
install-iconsDATA: $(icons_DATA)
27492
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
27493
- @list='$(icons_DATA)'; for p in $$list; do \
27494
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
27495
+ for p in $$list; do \
27496
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
27497
- f=$(am__strip_dir) \
27498
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
27499
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
27501
+ done | $(am__base_list) | \
27502
+ while read files; do \
27503
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
27504
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
27507
uninstall-iconsDATA:
27508
@$(NORMAL_UNINSTALL)
27509
- @list='$(icons_DATA)'; for p in $$list; do \
27510
- f=$(am__strip_dir) \
27511
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
27512
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
27514
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
27515
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
27516
+ test -n "$$files" || exit 0; \
27517
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
27518
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
27522
@@ -276,13 +298,17 @@
27523
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
27524
if test -d $$d/$$file; then \
27525
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
27526
+ if test -d "$(distdir)/$$file"; then \
27527
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
27529
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
27530
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
27531
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
27532
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
27534
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
27535
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
27537
- test -f $(distdir)/$$file \
27538
- || cp -p $$d/$$file $(distdir)/$$file \
27539
+ test -f "$(distdir)/$$file" \
27540
+ || cp -p $$d/$$file "$(distdir)/$$file" \
27544
@@ -313,6 +339,7 @@
27547
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
27548
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
27550
maintainer-clean-generic:
27551
@echo "This command is intended for maintainers to use"
27552
@@ -332,6 +359,8 @@
27561
@@ -340,18 +369,28 @@
27563
install-dvi: install-dvi-am
27569
install-html: install-html-am
27573
install-info: install-info-am
27579
install-pdf: install-pdf-am
27583
install-ps: install-ps-am
27589
maintainer-clean: maintainer-clean-am
27590
@@ -407,6 +446,7 @@
27595
# Tell versions [3.59,3.63) of GNU make to not export all variables.
27596
# Otherwise a system limit (for SysV at least) may be exceeded.
27598
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/scalable/categories/Makefile.in gnome-icon-theme-2.27.90.new/scalable/categories/Makefile.in
27599
--- gnome-icon-theme-2.27.90/scalable/categories/Makefile.in 2009-08-13 03:45:52.000000000 +0200
27600
+++ gnome-icon-theme-2.27.90.new/scalable/categories/Makefile.in 2009-08-27 12:38:32.000000000 +0200
27602
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
27603
+# Makefile.in generated by automake 1.11 from Makefile.am.
27604
# @configure_input@
27606
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
27607
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
27608
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
27610
# This Makefile.in is free software; the Free Software Foundation
27611
# gives unlimited permission to copy and/or distribute it,
27612
# with or without modifications, as long as this notice is preserved.
27616
pkgdatadir = $(datadir)/@PACKAGE@
27617
-pkglibdir = $(libdir)/@PACKAGE@
27618
pkgincludedir = $(includedir)/@PACKAGE@
27619
+pkglibdir = $(libdir)/@PACKAGE@
27620
+pkglibexecdir = $(libexecdir)/@PACKAGE@
27621
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
27622
install_sh_DATA = $(install_sh) -c -m 644
27623
install_sh_PROGRAM = $(install_sh) -c
27626
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
27627
CONFIG_CLEAN_FILES =
27628
+CONFIG_CLEAN_VPATH_FILES =
27631
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
27633
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
27636
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
27637
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
27638
+am__install_max = 40
27639
+am__nobase_strip_setup = \
27640
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
27641
+am__nobase_strip = \
27642
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
27643
+am__nobase_list = $(am__nobase_strip_setup); \
27644
+ for p in $$list; do echo "$$p $$p"; done | \
27645
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
27646
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
27647
+ if (++n[$$2] == $(am__install_max)) \
27648
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
27649
+ END { for (dir in files) print dir, files[dir] }'
27651
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
27652
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
27653
am__installdirs = "$(DESTDIR)$(iconsdir)"
27654
-iconsDATA_INSTALL = $(INSTALL_DATA)
27655
DATA = $(icons_DATA)
27656
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
27657
ACLOCAL = @ACLOCAL@
27658
@@ -106,6 +123,7 @@
27659
PACKAGE_NAME = @PACKAGE_NAME@
27660
PACKAGE_STRING = @PACKAGE_STRING@
27661
PACKAGE_TARNAME = @PACKAGE_TARNAME@
27662
+PACKAGE_URL = @PACKAGE_URL@
27663
PACKAGE_VERSION = @PACKAGE_VERSION@
27664
PATH_SEPARATOR = @PATH_SEPARATOR@
27665
PKG_CONFIG = @PKG_CONFIG@
27666
@@ -204,9 +222,9 @@
27670
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu scalable/categories/Makefile'; \
27671
- cd $(top_srcdir) && \
27672
- $(AUTOMAKE) --gnu scalable/categories/Makefile
27673
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu scalable/categories/Makefile'; \
27674
+ $(am__cd) $(top_srcdir) && \
27675
+ $(AUTOMAKE) --gnu scalable/categories/Makefile
27676
.PRECIOUS: Makefile
27677
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
27679
@@ -224,23 +242,27 @@
27680
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
27681
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
27682
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
27683
+$(am__aclocal_m4_deps):
27684
install-iconsDATA: $(icons_DATA)
27686
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
27687
- @list='$(icons_DATA)'; for p in $$list; do \
27688
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
27689
+ for p in $$list; do \
27690
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
27691
- f=$(am__strip_dir) \
27692
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
27693
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
27695
+ done | $(am__base_list) | \
27696
+ while read files; do \
27697
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
27698
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
27701
uninstall-iconsDATA:
27702
@$(NORMAL_UNINSTALL)
27703
- @list='$(icons_DATA)'; for p in $$list; do \
27704
- f=$(am__strip_dir) \
27705
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
27706
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
27708
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
27709
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
27710
+ test -n "$$files" || exit 0; \
27711
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
27712
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
27716
@@ -264,13 +286,17 @@
27717
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
27718
if test -d $$d/$$file; then \
27719
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
27720
+ if test -d "$(distdir)/$$file"; then \
27721
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
27723
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
27724
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
27725
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
27726
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
27728
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
27729
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
27731
- test -f $(distdir)/$$file \
27732
- || cp -p $$d/$$file $(distdir)/$$file \
27733
+ test -f "$(distdir)/$$file" \
27734
+ || cp -p $$d/$$file "$(distdir)/$$file" \
27738
@@ -301,6 +327,7 @@
27741
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
27742
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
27744
maintainer-clean-generic:
27745
@echo "This command is intended for maintainers to use"
27746
@@ -320,6 +347,8 @@
27755
@@ -328,18 +357,28 @@
27757
install-dvi: install-dvi-am
27763
install-html: install-html-am
27767
install-info: install-info-am
27773
install-pdf: install-pdf-am
27777
install-ps: install-ps-am
27783
maintainer-clean: maintainer-clean-am
27784
@@ -395,6 +434,7 @@
27789
# Tell versions [3.59,3.63) of GNU make to not export all variables.
27790
# Otherwise a system limit (for SysV at least) may be exceeded.
27792
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/scalable/devices/Makefile.in gnome-icon-theme-2.27.90.new/scalable/devices/Makefile.in
27793
--- gnome-icon-theme-2.27.90/scalable/devices/Makefile.in 2009-08-13 03:45:52.000000000 +0200
27794
+++ gnome-icon-theme-2.27.90.new/scalable/devices/Makefile.in 2009-08-27 12:38:32.000000000 +0200
27796
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
27797
+# Makefile.in generated by automake 1.11 from Makefile.am.
27798
# @configure_input@
27800
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
27801
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
27802
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
27804
# This Makefile.in is free software; the Free Software Foundation
27805
# gives unlimited permission to copy and/or distribute it,
27806
# with or without modifications, as long as this notice is preserved.
27810
pkgdatadir = $(datadir)/@PACKAGE@
27811
-pkglibdir = $(libdir)/@PACKAGE@
27812
pkgincludedir = $(includedir)/@PACKAGE@
27813
+pkglibdir = $(libdir)/@PACKAGE@
27814
+pkglibexecdir = $(libexecdir)/@PACKAGE@
27815
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
27816
install_sh_DATA = $(install_sh) -c -m 644
27817
install_sh_PROGRAM = $(install_sh) -c
27820
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
27821
CONFIG_CLEAN_FILES =
27822
+CONFIG_CLEAN_VPATH_FILES =
27825
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
27827
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
27830
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
27831
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
27832
+am__install_max = 40
27833
+am__nobase_strip_setup = \
27834
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
27835
+am__nobase_strip = \
27836
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
27837
+am__nobase_list = $(am__nobase_strip_setup); \
27838
+ for p in $$list; do echo "$$p $$p"; done | \
27839
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
27840
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
27841
+ if (++n[$$2] == $(am__install_max)) \
27842
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
27843
+ END { for (dir in files) print dir, files[dir] }'
27845
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
27846
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
27847
am__installdirs = "$(DESTDIR)$(iconsdir)"
27848
-iconsDATA_INSTALL = $(INSTALL_DATA)
27849
DATA = $(icons_DATA)
27850
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
27851
ACLOCAL = @ACLOCAL@
27852
@@ -106,6 +123,7 @@
27853
PACKAGE_NAME = @PACKAGE_NAME@
27854
PACKAGE_STRING = @PACKAGE_STRING@
27855
PACKAGE_TARNAME = @PACKAGE_TARNAME@
27856
+PACKAGE_URL = @PACKAGE_URL@
27857
PACKAGE_VERSION = @PACKAGE_VERSION@
27858
PATH_SEPARATOR = @PATH_SEPARATOR@
27859
PKG_CONFIG = @PKG_CONFIG@
27860
@@ -211,9 +229,9 @@
27864
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu scalable/devices/Makefile'; \
27865
- cd $(top_srcdir) && \
27866
- $(AUTOMAKE) --gnu scalable/devices/Makefile
27867
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu scalable/devices/Makefile'; \
27868
+ $(am__cd) $(top_srcdir) && \
27869
+ $(AUTOMAKE) --gnu scalable/devices/Makefile
27870
.PRECIOUS: Makefile
27871
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
27873
@@ -231,23 +249,27 @@
27874
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
27875
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
27876
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
27877
+$(am__aclocal_m4_deps):
27878
install-iconsDATA: $(icons_DATA)
27880
test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
27881
- @list='$(icons_DATA)'; for p in $$list; do \
27882
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
27883
+ for p in $$list; do \
27884
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
27885
- f=$(am__strip_dir) \
27886
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
27887
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
27889
+ done | $(am__base_list) | \
27890
+ while read files; do \
27891
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
27892
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
27895
uninstall-iconsDATA:
27896
@$(NORMAL_UNINSTALL)
27897
- @list='$(icons_DATA)'; for p in $$list; do \
27898
- f=$(am__strip_dir) \
27899
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
27900
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
27902
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
27903
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
27904
+ test -n "$$files" || exit 0; \
27905
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
27906
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
27910
@@ -271,13 +293,17 @@
27911
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
27912
if test -d $$d/$$file; then \
27913
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
27914
+ if test -d "$(distdir)/$$file"; then \
27915
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
27917
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
27918
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
27919
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
27920
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
27922
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
27923
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
27925
- test -f $(distdir)/$$file \
27926
- || cp -p $$d/$$file $(distdir)/$$file \
27927
+ test -f "$(distdir)/$$file" \
27928
+ || cp -p $$d/$$file "$(distdir)/$$file" \
27932
@@ -308,6 +334,7 @@
27935
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
27936
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
27938
maintainer-clean-generic:
27939
@echo "This command is intended for maintainers to use"
27940
@@ -327,6 +354,8 @@
27949
@@ -335,18 +364,28 @@
27951
install-dvi: install-dvi-am
27957
install-html: install-html-am
27961
install-info: install-info-am
27967
install-pdf: install-pdf-am
27971
install-ps: install-ps-am
27977
maintainer-clean: maintainer-clean-am
27978
@@ -402,6 +441,7 @@
27983
# Tell versions [3.59,3.63) of GNU make to not export all variables.
27984
# Otherwise a system limit (for SysV at least) may be exceeded.
27986
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.27.90/scalable/emblems/Makefile.in gnome-icon-theme-2.27.90.new/scalable/emblems/Makefile.in
27987
--- gnome-icon-theme-2.27.90/scalable/emblems/Makefile.in 2009-08-13 03:45:52.000000000 +0200
27988
+++ gnome-icon-theme-2.27.90.new/scalable/emblems/Makefile.in 2009-08-27 12:38:32.000000000 +0200
27990
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
27991
+# Makefile.in generated by automake 1.11 from Makefile.am.
27992
# @configure_input@
27994
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
27995
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
27996
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
27998
# This Makefile.in is free software; the Free Software Foundation
27999
# gives unlimited permission to copy and/or distribute it,
28000
# with or without modifications, as long as this notice is preserved.
28004
pkgdatadir = $(datadir)/@PACKAGE@
28005
-pkglibdir = $(libdir)/@PACKAGE@
28006
pkgincludedir = $(includedir)/@PACKAGE@
28007
+pkglibdir = $(libdir)/@PACKAGE@
28008
+pkglibexecdir = $(libexecdir)/@PACKAGE@
28009
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
28010
install_sh_DATA = $(install_sh) -c -m 644
28011
install_sh_PROGRAM = $(install_sh) -c
28014
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
28015
CONFIG_CLEAN_FILES =
28016
+CONFIG_CLEAN_VPATH_FILES =
28019
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
28020
@@ -45,10 +48,23 @@
28021
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
28024
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
28025
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
28026
+am__install_max = 40
28027
+am__nobase_strip_setup = \
28028
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
28029
+am__nobase_strip = \
28030
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
28031
+am__nobase_list = $(am__nobase_strip_setup); \
28032
+ for p in $$list; do echo "$$p $$p"; done | \
28033
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
28034
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
28035
+ if (++n[$$2] == $(am__install_max)) \
28036
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
28037
+ END { for (dir in files) print dir, files[dir] }'
28039
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
28040
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
28041
am__installdirs = "$(DESTDIR)$(iconsdir)" "$(DESTDIR)$(svgdir)"
28042
-iconsDATA_INSTALL = $(INSTALL_DATA)
28043
-svgDATA_INSTALL = $(INSTALL_DATA)
28044
DATA = $(icons_DATA) $(svg_DATA)
28045
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
28046
ACLOCAL = @ACLOCAL@
28047
@@ -107,6 +123,7 @@
28048
PACKAGE_NAME = @PACKAGE_NAME@
28049
PACKAGE_STRING = @PACKAGE_STRING@
28050
PACKAGE_TARNAME = @PACKAGE_TARNAME@
28051
+PACKAGE_URL = @PACKAGE_URL@
28052
PACKAGE_VERSION = @PACKAGE_VERSION@
28053
PATH_SEPARATOR = @PATH_SEPARATOR@
28054
PKG_CONFIG = @PKG_CONFIG@
28055
@@ -169,6 +186,7 @@
465
-# Substitute ALL_LINGUAS so we can use it in po/Makefile
466
-AC_SUBST(ALL_LINGUAS)
468
-# Set DATADIRNAME correctly if it is not set yet
469
-# (copied from glib-gettext.m4)
470
-if test -z "$DATADIRNAME"; then
472
- [AC_LANG_PROGRAM([[]],
473
- [[extern int _nl_msg_cat_cntr;
474
- return _nl_msg_cat_cntr]])],
475
- [DATADIRNAME=share],
478
- dnl On Solaris, if bind_textdomain_codeset is in libc,
479
- dnl GNU format message catalog is always supported,
480
- dnl since both are added to the libc all together.
481
- dnl Hence, we'd like to go with DATADIRNAME=share
483
- AC_CHECK_FUNC(bind_textdomain_codeset,
484
- [DATADIRNAME=share], [DATADIRNAME=lib])
491
-AC_SUBST(DATADIRNAME)
498
-# IT_PO_SUBDIR(DIRNAME)
499
-# ---------------------
500
-# All po subdirs have to be declared with this macro; the subdir "po" is
501
-# declared by IT_PROG_INTLTOOL.
503
-AC_DEFUN([IT_PO_SUBDIR],
504
-[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
506
-dnl The following CONFIG_COMMANDS should be exetuted at the very end
507
-dnl of config.status.
508
-AC_CONFIG_COMMANDS_PRE([
509
- AC_CONFIG_COMMANDS([$1/stamp-it], [
510
- if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
511
- AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
513
- rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
518
- '"s|^| $ac_top_srcdir/|" \
519
- "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
521
- [sed '/^POTFILES =/,/[^\\]$/ {
525
- ' "$1/Makefile.in" >"$1/Makefile"]
526
- rm -f "$1/Makefile.tmp"
527
- mv "$1/stamp-it.tmp" "$1/stamp-it"
532
-# _IT_SUBST(VARIABLE)
533
-# -------------------
534
-# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
536
-AC_DEFUN([_IT_SUBST],
539
-m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
544
-AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
545
-# A hint is needed for aclocal from Automake <= 1.9.4:
546
-# AC_DEFUN([AC_PROG_INTLTOOL], ...)
549
diff -Nur -x '*.orig' -x '*~' gnome-icon-theme-2.28.0/scalable/emblems/Makefile.in gnome-icon-theme-2.28.0.new/scalable/emblems/Makefile.in
550
--- gnome-icon-theme-2.28.0/scalable/emblems/Makefile.in 2009-09-22 11:41:00.000000000 +1000
551
+++ gnome-icon-theme-2.28.0.new/scalable/emblems/Makefile.in 2009-09-22 14:06:13.000000000 +1000
28056
553
iconsdir = $(themedir)/$(size)/$(context)
28057
554
svgdir = $(iconsdir)
28058
555
icon_in_files = \