[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r6291 - in gnunet-gtk: . pixmaps pixmaps/icons
From: |
gnunet |
Subject: |
[GNUnet-SVN] r6291 - in gnunet-gtk: . pixmaps pixmaps/icons |
Date: |
Wed, 13 Feb 2008 19:54:06 -0700 (MST) |
Author: grothoff
Date: 2008-02-13 19:54:06 -0700 (Wed, 13 Feb 2008)
New Revision: 6291
Added:
gnunet-gtk/pixmaps/Makefile.am
Modified:
gnunet-gtk/configure.ac
gnunet-gtk/pixmaps/icons/Makefile.am
gnunet-gtk/pixmaps/icons/icon-theme-installer
Log:
icon install
Modified: gnunet-gtk/configure.ac
===================================================================
--- gnunet-gtk/configure.ac 2008-02-14 00:02:06 UTC (rev 6290)
+++ gnunet-gtk/configure.ac 2008-02-14 02:54:06 UTC (rev 6291)
@@ -337,6 +337,8 @@
src/plugins/fs/Makefile
src/plugins/peers/Makefile
src/plugins/stats/Makefile
+pixmaps/Makefile
+pixmaps/icons/Makefile
po/Makefile.in
po/Makefile
gnunet-gtk.desktop
Added: gnunet-gtk/pixmaps/Makefile.am
===================================================================
--- gnunet-gtk/pixmaps/Makefile.am (rev 0)
+++ gnunet-gtk/pixmaps/Makefile.am 2008-02-14 02:54:06 UTC (rev 6291)
@@ -0,0 +1,3 @@
+## Process this file with automake to produce Makefile.in
+
+SUBDIRS = icons
Modified: gnunet-gtk/pixmaps/icons/Makefile.am
===================================================================
--- gnunet-gtk/pixmaps/icons/Makefile.am 2008-02-14 00:02:06 UTC (rev
6290)
+++ gnunet-gtk/pixmaps/icons/Makefile.am 2008-02-14 02:54:06 UTC (rev
6291)
@@ -7,14 +7,13 @@
apps,gnunet-gtk-24.png \
apps,gnunet-gtk-32.png
-install_icon_exec = $(top_srcdir)/pixmaps/icons/icon-theme-installer -t
-$(theme) -s $(srcdir) -d "x$(DESTDIR)" -b $(themedir) -m
-"$(mkinstalldirs)" -x "$(INSTALL_DATA)"
+install_icon_exec=${top_srcdir}/pixmaps/icons/icon-theme-installer -t ${theme}
-s ${srcdir} -b ${themedir} -m "${mkinstalldirs}" -x "${INSTALL_DATA}"
+
install-data-local:
- $(install_icon_exec) -i $(theme_icons)
+ $(install_icon_exec) -i "${theme_icons}"
uninstall-hook:
- $(install_icon_exec) -u $(theme_icons)
+ $(install_icon_exec) -u "${theme_icons}"
MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = $(wildcard *.svg *.png)
Modified: gnunet-gtk/pixmaps/icons/icon-theme-installer
===================================================================
--- gnunet-gtk/pixmaps/icons/icon-theme-installer 2008-02-14 00:02:06 UTC
(rev 6290)
+++ gnunet-gtk/pixmaps/icons/icon-theme-installer 2008-02-14 02:54:06 UTC
(rev 6291)
@@ -30,7 +30,7 @@
# music-player-banshee-16.png
#
# The <SIZE> here is -16 and will expand to 16x16 per the icon theme
-spec
+# spec
#
# What follows is an example Makefile.am for icon theme installation:
#
@@ -45,8 +45,8 @@
# apps,music-player-banshee-32.png
#
# install_icon_exec = $(top_srcdir)/build/icon-theme-installer -t
-$(theme) -s $(srcdir) -d "x$(DESTDIR)" -b $(themedir) -m
-"$(mkinstalldirs)" -x "$(INSTALL_DATA)"
+# $(theme) -s $(srcdir) -d "x$(DESTDIR)" -b $(themedir) -m
+#"$(mkinstalldirs)" -x "$(INSTALL_DATA)"
# install-data-local:
# $(install_icon_exec) -i $(theme_icons)
#
@@ -63,15 +63,14 @@
# -u : Uninstall
# -t <theme> : Theme name (hicolor)
# -b <dir> : Theme installation dest directory [x$(DESTDIR)] - Always
-prefix
+# prefix
# this argument with x; it will be stripped but will act as
-a
# placeholder for zero $DESTDIRs (only set by packagers)
# -d <dir> : Theme installation directory [$(hicolordir)]
# -s <dir> : Source directory [$(srcdir)]
# -m <exec> : Command to exec for directory creation [$(mkinstalldirs)]
# -x <exec> : Command to exec for single file installation
-[$(INSTALL_DATA)]
+# [$(INSTALL_DATA)]
# <remainging> : All remainging should be category,filename pairs
while getopts "iut:b:d:s:m:x:" flag; do
@@ -149,8 +148,7 @@
exit 1
}
- $($INSTALL_DATA_EXEC $SRC_DIR/$build_name $install_path)
-|| {
+ $($INSTALL_DATA_EXEC $SRC_DIR/$build_name $install_path) || {
echo "Failed to install $SRC_DIR/$build_name
into $install_path"
exit 1
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r6291 - in gnunet-gtk: . pixmaps pixmaps/icons,
gnunet <=