summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Reveman <davidr@novell.com>2006-09-29 17:28:11 -0400
committerDavid Reveman <davidr@novell.com>2006-09-29 17:28:11 -0400
commitc696c9f8fc5801a05c174d34c09cdc3faf17af22 (patch)
treefba9eae85fcfcb85737e11f700c9b65203300c91
parentb7a0f000a037da05ae54586581f8a33082481d64 (diff)
Only install settings module and desktop file if file permissions allow it.
-rw-r--r--gtk/gnome/Makefile.am21
1 files changed, 16 insertions, 5 deletions
diff --git a/gtk/gnome/Makefile.am b/gtk/gnome/Makefile.am
index dea7a639..cadce1ad 100644
--- a/gtk/gnome/Makefile.am
+++ b/gtk/gnome/Makefile.am
@@ -1,5 +1,7 @@
+moduledir = $(windowsettingslibdir)/window-manager-settings
+
if USE_GNOME
-libcompiz_la_LDFLAGS = -export-dynamic -avoid-version
+libcompiz_la_LDFLAGS = -export-dynamic -avoid-version -rpath $(moduledir)
libcompiz_la_LIBADD = @GNOME_WINDOW_SETTINGS_LIBS@
libcompiz_la_SOURCES = \
compiz-window-manager.c \
@@ -9,13 +11,22 @@ libcompiz_module = libcompiz.la
desktopfilesdir = $(windowsettingsdatadir)/gnome/wm-properties
desktopfiles_in_files = compiz.desktop.in
desktopfiles_files = $(desktopfiles_in_files:.desktop.in=.desktop)
-desktopfiles_DATA = $(desktopfiles_files)
+noinst_DATA = $(desktopfiles_files)
endif
INCLUDES = @GNOME_WINDOW_SETTINGS_CFLAGS@ \
-DMETACITY_THEME_DIR=\""$(windowsettingsdatadir)/themes"\"
-moduledir = $(windowsettingslibdir)/window-manager-settings
-
-module_LTLIBRARIES = \
+noinst_LTLIBRARIES = \
$(libcompiz_module)
+
+install-exec-local:
+ if test -w $(moduledir); then ( \
+ $(LIBTOOL) --mode=install $(INSTALL) $(libcompiz_module) \
+ $(moduledir) \
+ ); \
+ fi
+ if test -w $(desktopfilesdir); then ( \
+ $(INSTALL) -m 644 $(desktopfiles_files) $(desktopfilesdir) \
+ ); \
+ fi