From 8db1592a73b51c332d81b7c1c37aa3f167abaaed Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Tue, 20 May 2008 21:59:34 +0000
Subject: [PATCH] Monotone-Parent: 54120879416d39c546964fc67827055376047340
 Monotone-Revision: e0ce68cefe0f0cfcd77e9154b801fa154c153a18

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-05-20T21:59:34
Monotone-Branch: ca.inverse.sogo
---
 UI/Templates/GNUmakefile          | 29 +++++++++++++++--------------
 UI/WebServerResources/GNUmakefile |  8 ++++++--
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/UI/Templates/GNUmakefile b/UI/Templates/GNUmakefile
index 1ad7f522a..e2d7f2a80 100644
--- a/UI/Templates/GNUmakefile
+++ b/UI/Templates/GNUmakefile
@@ -18,21 +18,22 @@ validate-wox:
 	@for wox in $(WOXS); \
 	  do $(XMLLINT-BIN) --noout $$wox || exit 1; \
 	done;
+	@echo "Template files validated"
 
-mkinstall-dirs ::
-	@if [ ! -d $(SOGO_TEMPLATESDIR) ]; then mkdir -p $(SOGO_TEMPLATESDIR); fi 
-	@for dir in $(TEMPLATE_DIRS); do \
-	  if [ ! -d $(SOGO_TEMPLATESDIR)/$$dir ]; then \
-	    echo Creating template directory \"$(SOGO_TEMPLATESDIR)/$$dir\"...; \
-	    mkdir $(SOGO_TEMPLATESDIR)/$$dir; \
-	  fi; \
-	done
-
-install-files ::
-	@echo Installing template files...
-	@tar cf - $(WOXS) | ( cd $(SOGO_TEMPLATESDIR); tar xf -)
-
-install :: mkinstall-dirs install-files
+install ::
+	@if [ -L "$(SOGO_TEMPLATESDIR)" ]; then \
+	  echo "$(SOGO_TEMPLATESDIR) is a symbolic link (for development?). Installation skipped."; \
+	else \
+	  if [ ! -d $(SOGO_TEMPLATESDIR) ]; then mkdir -p $(SOGO_TEMPLATESDIR); fi; \
+	  for dir in $(TEMPLATE_DIRS); do \
+	    if [ ! -d $(SOGO_TEMPLATESDIR)/$$dir ]; then \
+	      echo Creating template directory \"$(SOGO_TEMPLATESDIR)/$$dir\"...; \
+	      mkdir $(SOGO_TEMPLATESDIR)/$$dir; \
+	    fi; \
+	  done; \
+	  echo Installing template files...; \
+	  tar cf - $(WOXS) | ( cd $(SOGO_TEMPLATESDIR); tar xf -) ;\
+	fi
 
 clean ::
 
diff --git a/UI/WebServerResources/GNUmakefile b/UI/WebServerResources/GNUmakefile
index 2085dccf9..b2e166e74 100644
--- a/UI/WebServerResources/GNUmakefile
+++ b/UI/WebServerResources/GNUmakefile
@@ -7,8 +7,12 @@ WEBSERVER_RESOURCE_FILES = $(shell ls *css *ico *js *.jpg *gif *png *html *txt)
 all ::
 
 install ::
-	@mkdir -p ${SOGO_WEBSERVERRESOURCESDIR}
-	@cp $(WEBSERVER_RESOURCE_FILES) ${SOGO_WEBSERVERRESOURCESDIR}
+	@if [ -L "$(SOGO_WEBSERVERRESOURCESDIR)" ]; then \
+	  echo "$(SOGO_WEBSERVERRESOURCESDIR) is a symbolic link (for development?). Installation skipped."; \
+	else \
+	  mkdir -p $(SOGO_WEBSERVERRESOURCESDIR); \
+	  cp $(WEBSERVER_RESOURCE_FILES) $(SOGO_WEBSERVERRESOURCESDIR); \
+	fi
 
 clean ::