[GNUnet-SVN] r16936 - in gnunet-gtk: . contrib

[gnunet]

Author: grothoff
Date: 2011-09-18 15:07:28 +0200 (Sun, 18 Sep 2011)
New Revision: 16936

Added:
   gnunet-gtk/contrib/gnunet-setup-oxygen-cancel.png
   gnunet-gtk/contrib/gnunet-setup-oxygen-ok.png
Removed:
   gnunet-gtk/gnunet-setup-oxygen-cancel.png
   gnunet-gtk/gnunet-setup-oxygen-ok.png
Modified:
   gnunet-gtk/Makefile.am
   gnunet-gtk/contrib/Makefile.am
Log:
move images

Modified: gnunet-gtk/Makefile.am
===================================================================
--- gnunet-gtk/Makefile.am      2011-09-18 13:03:47 UTC (rev 16935)
+++ gnunet-gtk/Makefile.am      2011-09-18 13:07:28 UTC (rev 16936)
@@ -12,20 +12,10 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-IMAGES = \
- gnunet-setup-oxygen-cancel.png \
- gnunet-setup-oxygen-ok.png 
-
 install-data-local:
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(pkgpixdir)
-       for pixmap in $(IMAGES); do \
-         if test -f $$pixmap; then \
-           $(INSTALL_DATA) $$pixmap $(DESTDIR)$(pkgpixdir); \
-         fi \
-       done
 
 EXTRA_DIST = \
   config.rpath  \
-  install-sh mkinstalldirs \
-  $(IMAGES) 
+  install-sh mkinstalldirs 

Modified: gnunet-gtk/contrib/Makefile.am
===================================================================
--- gnunet-gtk/contrib/Makefile.am      2011-09-18 13:03:47 UTC (rev 16935)
+++ gnunet-gtk/contrib/Makefile.am      2011-09-18 13:07:28 UTC (rev 16936)
@@ -4,8 +4,13 @@
 
 pkgpixdir= $(pkgdatadir)
 
+IMAGES = \
+ gnunet-setup-oxygen-cancel.png \
+ gnunet-setup-oxygen-ok.png 
+
 EXTRA_DIST = \
-  $(pkgdata_DATA) 
+  $(pkgdata_DATA) \
+  $(IMAGES)
 
 pkgdata_DATA = \
   gnunet_fs_gtk_about_dialog.glade \
@@ -33,6 +38,11 @@
        $(mkinstalldirs) $(DESTDIR)$(pkgpixdir)
        $(mkinstalldirs) $(DESTDIR)$(pkgpixdir)/flags
        @$(NORMAL_INSTALL)
+       for pixmap in $(IMAGES); do \
+         if test -f $$pixmap; then \
+           $(INSTALL_DATA) $$pixmap $(DESTDIR)$(pkgpixdir); \
+         fi \
+       done
        for flag in $(srcdir)/contrib/flags/*.png; do \
          if test -f $$flag; then \
            $(INSTALL_DATA) $$flag $(DESTDIR)$(pkgpixdir)/flags/ ; \

Copied: gnunet-gtk/contrib/gnunet-setup-oxygen-cancel.png (from rev 16917, 
gnunet-gtk/gnunet-setup-oxygen-cancel.png)
===================================================================
(Binary files differ)

Copied: gnunet-gtk/contrib/gnunet-setup-oxygen-ok.png (from rev 16917, 
gnunet-gtk/gnunet-setup-oxygen-ok.png)
===================================================================
(Binary files differ)

Deleted: gnunet-gtk/gnunet-setup-oxygen-cancel.png
===================================================================
(Binary files differ)

Deleted: gnunet-gtk/gnunet-setup-oxygen-ok.png
===================================================================
(Binary files differ)