[ekiga/gnome-2-26] [windows] Fix install target during building

[Eugen Dedu <ededu src gnome org>]

commit 741051e2c312afe9d775863f9cd3b8799835e59e
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date:   Mon Apr 19 14:08:45 2010 +0200

    [windows] Fix install target during building
    
    This commit finally allow to generate ekiga-setup.exe.

 win32/Makefile |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/win32/Makefile b/win32/Makefile
index 6c9c402..9531a49 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -82,9 +82,8 @@ endif
 endif
 EKIGA_PREFIX := $(TARGETDIR)/Ekiga
 EKIGA_INSTALLER := ekiga-setup-$(EKIGA_VER).exe
-EKIGA_WIN32_DIR := $(CURDIR)
-EKIGA_WIN32_DIFF_DIR := $(EKIGA_WIN32_DIR)/diff
-EKIGA_INSTALLER_DIR := $(BUILDROOT)/nsisinstaller
+EKIGA_WIN32_DIFF_DIR := $(CURDIR)/diff
+EKIGA_INSTALLER_DIR := $(EKIGA_DIR)/win32/nsisinstaller
 
 ifeq ($(RELEASE),1)
 	OPAL_VER := 3.6.6
@@ -701,7 +700,7 @@ $(TARGETDIR)/zips: binaries $(EKIGA_DIR)/src/ekiga.exe
 	-$(RM) -rf $(TARGETDIR)
 
 	mkdir $(TARGETDIR)
-	make -C ekiga install
+	make -C $(EKIGA_DIR) install
 	mkdir -p $(EKIGA_PREFIX)/plugins
 	for plugin in $(LIBDIR)/opal*/codecs/audio/*; do \
 	        install -m 755 $$plugin $(EKIGA_PREFIX)/plugins ;\
@@ -729,8 +728,8 @@ endif
 		fi \
 	done
 	cd $(TARGETDIR); zip -9r ekiga-$(EKIGA_VER).zip Ekiga
-	zip -9r $(TARGETDIR)/ekiga_build-$(EKIGA_VER).zip Makefile $(EKIGA_WIN32_DIFF_DIR)/* ico/*
-	tar cfvz $(TARGETDIR)/ekiga_build-$(EKIGA_VER).tgz Makefile $(EKIGA_WIN32_DIFF_DIR)/* ico/*
+	zip -9r $(TARGETDIR)/ekiga_build-$(EKIGA_VER).zip Makefile #$(EKIGA_WIN32_DIFF_DIR)
+	tar cfvz $(TARGETDIR)/ekiga_build-$(EKIGA_VER).tgz Makefile #$(EKIGA_WIN32_DIFF_DIR)
 	touch $@
 
 #### README about NSIS installer ####