[Xfce4-commits] <xfce4-docs:xfce4-clipman-plugin-master> Fix symlink of media directory

[Mike Massonnet]

Updating branch refs/heads/xfce4-clipman-plugin-master
         to 0b84b9c2cae31356af4a035d83f7d63af4b787fc (commit)
       from fbfdf73383b20387a0885ca878398207984a551d (commit)

commit 0b84b9c2cae31356af4a035d83f7d63af4b787fc
Author: Mike Massonnet <mmassonnet at xfce.org>
Date:   Mon Oct 24 17:34:01 2011 +0200

    Fix symlink of media directory
    
    Translations that don't provide screenshots have a "media" symlink
    that points to the C version. Instead of pointing to:
      $(DESTDIR)$(docdir)/html/C/media
    simply point to:
      ../C/media
    
    $(DESTDIR) must not be present and was a bug.
    
    Also updated the install-data-local rule to delete preexisting symlink
    when running make install again.

 Makefile.am |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 0816992..be26369 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,8 +22,11 @@ install-data-local:
 				$(mkinstalldirs) $(TARGET_DIR)/$$lang; \
 				$(INSTALL_DATA) $(srcdir)/html/$$lang/index.html $(TARGET_DIR)/$$lang; \
 			fi; \
-			if test ! -d "$(TARGET_DIR)/$$lang/media"; then \
-				$(LN_S) $(TARGET_DIR)/C/media $(TARGET_DIR)/$$lang/media; \
+			if test ! -d "$(TARGET_DIR)/$$lang/media" -o -L "$(TARGET_DIR)/$$lang/media"; then \
+				if test -L "$(TARGET_DIR)/$$lang/media"; then \
+					rm -f $(TARGET_DIR)/$$lang/media; \
+				fi; \
+				$(LN_S) ../C/media $(TARGET_DIR)/$$lang/media; \
 			fi; \
 		done; \
 	else \