[ekiga] [windows] Simplify generation of installation directory structure

[Eugen Dedu <ededu src gnome org>]

commit d310c4f094a1a17cf8ef6ba3514b862da8007b1b
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date:   Wed Dec 11 12:47:21 2013 +0100

    [windows] Simplify generation of installation directory structure
    
    Use Makefile instead of ekiga.nsi to create directory structure of
    ekiga installation directory.  It is impossible to understand how
    "File /r" in nsis works...

 win32/Makefile                |    2 ++
 win32/nsisinstaller/ekiga.nsi |   11 +----------
 2 files changed, 3 insertions(+), 10 deletions(-)
---
diff --git a/win32/Makefile b/win32/Makefile
index a5384ef..6a76cae 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -621,6 +621,8 @@ $(TARGETDIR)/zips: binaries $(EKIGA_DIR)/src/ekiga.exe
        for lib in liblber.dll libldap.dll libspeex-1.dll libspeexdsp-1.dll libtheora-0.dll avcodec-54.dll 
avutil-52.dll libogg-0.dll; do \
                cp -r $(BINDIR)/$$lib $(EKIGA_PREFIX) ;\
        done
+       # locale for ekiga are not found if they are in /share
+       mv $(EKIGA_PREFIX)/share/locale $(EKIGA_PREFIX)
        # GTK libraries
        for lib in libatk-1.0-0.dll libcairo-2.dll libcairo-gobject-2.dll libffi-6.dll libfreetype-6.dll 
libgdk_pixbuf-2.0-0.dll libgdk-3-0.dll libgio-2.0-0.dll libglib-2.0-0.dll libgmodule-2.0-0.dll 
libgobject-2.0-0.dll libgtk-3-0.dll libiconv-2.dll libintl-8.dll libpango-1.0-0.dll libpangocairo-1.0-0.dll 
libpangowin32-1.0-0.dll libpixman-1-0.dll libpng15-15.dll libxml2-2.dll pthreadGC2.dll zlib1.dll 
liblzma-5.dll; do \
                cp -r $(BINDIR)/$$lib $(EKIGA_PREFIX) ;\
diff --git a/win32/nsisinstaller/ekiga.nsi b/win32/nsisinstaller/ekiga.nsi
index 37cdeb5..ff5a0d6 100644
--- a/win32/nsisinstaller/ekiga.nsi
+++ b/win32/nsisinstaller/ekiga.nsi
@@ -226,17 +226,8 @@ Section $(EKIGA_SECTION_TITLE) SecEkiga
   ekiga_install_files:
     SetOutPath "$INSTDIR"
     ; Ekiga files
-    ; read http://nsis.sourceforge.net/Docs/Chapter4.html#4.9.1.5 to understand File /r
     SetOverwrite on
-    File "${TARGET_DIR}\Ekiga\*.exe"
-    File "${TARGET_DIR}\Ekiga\*.dll"
-    File /r "${TARGET_DIR}\Ekiga\icons"
-    File /r "${TARGET_DIR}\Ekiga\ekiga"
-    File /r "${TARGET_DIR}\Ekiga\sounds"
-    File /r "${TARGET_DIR}\Ekiga\help"
-    File /r "${TARGET_DIR}\Ekiga\share\locale"
-    File /r /x man "${TARGET_DIR}\Ekiga\share"
-    File /r "${TARGET_DIR}\Ekiga\plugins"
+    File /r "${TARGET_DIR}/Ekiga/*.*"
     File "${EKIGA_DIR}/win32/ico/ekiga.ico"
 
     ; If we don't have install rights.. we're done