summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Kasprzyk <onestone@opencompositing.org>2008-03-14 03:59:13 +0100
committerDennis kasprzyk <onestone@opencompositing.org>2008-03-14 03:59:13 +0100
commit615f23a87e2c4a4b76f11de063ca949425ddb7a6 (patch)
tree6ab097be6c4ac4bfca1a10fb8b1dea82017a085c
parent675e5ebbe6a1afd84f271599b6202e14502e0b95 (diff)
downloadneg-615f23a87e2c4a4b76f11de063ca949425ddb7a6.tar.gz
neg-615f23a87e2c4a4b76f11de063ca949425ddb7a6.tar.bz2
Makefile update.
-rw-r--r--Makefile20
1 files changed, 18 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 414ada6..6af121c 100644
--- a/Makefile
+++ b/Makefile
@@ -405,8 +405,12 @@ install: $(DESTDIR) all
else \
$(ECHO) "install : $(schema-output)"; \
fi; \
- GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
- gconftool-2 --makefile-install-rule $(schema-output) > /dev/null; \
+ GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`; \
+ if [ "x$(USER)" = "xroot" ]; then \
+ gconftool-2 --makefile-install-rule $(schema-output) > /dev/null; \
+ else \
+ gconftool-2 --install-schema-file=$(schema-output) > /dev/null; \
+ fi; \
if [ '$(color)' != 'no' ]; then \
$(ECHO) -e "\r\033[0minstall : \033[34m$(schema-output)\033[0m"; \
fi; \
@@ -489,6 +493,18 @@ uninstall:
$(ECHO) -e "\r\033[0muninstall : \033[34m$(PKGDIR)/compiz-$(PLUGIN).pc\033[0m"; \
fi; \
fi
+ @if [ -n "$(schema-output)" -a -e "$(schema-output)" -a 'x$(USER)' = 'xroot' ]; then \
+ if [ '$(color)' != 'no' ]; then \
+ $(ECHO) -n -e "\033[0;1;5muninstall \033[0m: \033[0;31m$(schema-output)\033[0m"; \
+ else \
+ $(ECHO) "uninstall : $(schema-output)"; \
+ fi; \
+ GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
+ gconftool-2 --makefile-install-rule $(schema-output) > /dev/null; \
+ if [ '$(color)' != 'no' ]; then \
+ $(ECHO) -e "\r\033[0muninstall : \033[34m$(schema-output)\033[0m"; \
+ fi; \
+ fi
@if [ -n "$(data-files)" ]; then \
for FILE in $(data-files); do \
if [ '$(color)' != 'no' ]; then \