[nautilus-actions] gconf-schemas/Makefile.am: do not stop but warns when not root



commit d5bc5425e6a0fa0e7cf0814c21edecf55be1876c
Author: Pierre Wieser <pwieser trychlos org>
Date:   Tue Feb 21 17:23:37 2017 +0100

    gconf-schemas/Makefile.am: do not stop but warns when not root

 data/gconf-schemas/Makefile.am |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/data/gconf-schemas/Makefile.am b/data/gconf-schemas/Makefile.am
index f846b2d..e5235fa 100644
--- a/data/gconf-schemas/Makefile.am
+++ b/data/gconf-schemas/Makefile.am
@@ -44,7 +44,7 @@ schemas_DATA = $(schemas_files)
 @INTLTOOL_SCHEMAS_RULE@
 
 if GCONF_SCHEMAS_INSTALL
-FMA_INSTALL_SCHEMAS  = yes
+FMA_INSTALL_SCHEMAS = yes
 else
 FMA_INSTALL_SCHEMAS = no
 endif
@@ -56,14 +56,12 @@ EXTRA_DIST = \
 install-data-hook:
        @if test "$(FMA_INSTALL_SCHEMAS)" = "yes"; then \
                if test `id -u` != 0; then \
-                       echo "***"; \
-                       echo "*** You need to be root to install GConf schemas"; \
-                       echo "***"; \
-                       exit 1; \
+                       echo "GConf schemas will not be installed because you are not root"; \
+               else \
+                       for p in $(schemas_DATA); do \
+                               GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) 
--makefile-install-rule $$p; \
+                       done \
                fi; \
-               for p in $(schemas_DATA); do \
-                       GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) 
--makefile-install-rule $$p; \
-               done \
        fi
 
 CLEANFILES = $(schemas_files)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]