- merged from DEVEL

- don't copy COPYING

Changed files:
    gajim-makefile.patch -> 1.3

diff --git a/gajim-makefile.patch b/gajim-makefile.patch
index 9ec74310289c51ef320023ec06cc83c286be34bb..01bff6f67b6451feb35e1ddeeb304ff11a90a6ac 100644 (file)
--- a/gajim-makefile.patch
+++ b/gajim-makefile.patch
@@ -1,26 +1,33 @@
-diff -urN gajim-0.7.1/Makefile fix/gajim-0.7.1/Makefile
---- gajim-0.7.1/Makefile       2005-06-05 12:56:42.000000000 +0200
-+++ fix/gajim-0.7.1/Makefile   2005-06-15 15:55:22.000000000 +0200
-@@ -1,8 +1,9 @@
- VERSION               ?= 0.7.1
+diff -urN gajim-0.8.orig/Makefile gajim-0.8/Makefile
+--- gajim-0.8.orig/Makefile    2005-08-19 09:18:23.577272312 +0200
++++ gajim-0.8/Makefile 2005-08-19 09:19:14.011605128 +0200
+@@ -3,10 +3,10 @@
+ GAJIM_AP      = 0 # do we build Autopackage?
  
  MODULES               = src src/common po
--PREFIX                = /usr
- DESTDIR               = /
+-PREFIX                = /usr/local
 +PREFIX                = /usr
-+LIBDIR                = /lib
+ DESTDIR               = 
+ LIBDIR                = /lib
+-MANDIR                = $(DESTDIR)$(PREFIX)/share/man
++MANDIR                = $(PREFIX)/share/man
  
  FIND          = find . \( -name '*.glade' -o -name '*.py' -o -name '*.xpm' -o -name '*.gif' -o -name '*.png' -o -name '*.mo' -o -name '*.wav' \)
  
-@@ -67,9 +68,9 @@
+@@ -67,14 +67,13 @@
+               DST=`dirname "$$f"`; \
+               cp "$$f" "$(DESTDIR)$(PREFIX)/share/gajim/$$DST/"; \
+       done
+-      cp COPYING "$(DESTDIR)$(PREFIX)/share/gajim/";
+       mkdir -p "$(DESTDIR)$(PREFIX)/share/pixmaps";
+       cp data/pixmaps/gajim.png "$(DESTDIR)$(PREFIX)/share/pixmaps/";
+       cp data/pixmaps/gajim_about.png "$(DESTDIR)$(PREFIX)/share/pixmaps/";
+       mkdir -p "$(DESTDIR)$(PREFIX)/share/applications";
        cp gajim.desktop "$(DESTDIR)$(PREFIX)/share/applications/";
-       mkdir -p "$(DESTDIR)$(PREFIX)/share/man/man1";
-       cp gajim.1 "$(DESTDIR)$(PREFIX)/share/man/man1";
--      mkdir -p "$(DESTDIR)$(PREFIX)/lib/gajim";
-+      mkdir -p "$(DESTDIR)$(PREFIX)$(LIBDIR)/gajim";
+-      mkdir -p "$(MANDIR)/man1";
+-      cp gajim.1 "$(MANDIR)/man1";
++      mkdir -p "$(DESTDIR)$(MANDIR)/man1";
++      cp gajim.1 "$(DESTDIR)$(MANDIR)/man1";
+       mkdir -p "$(DESTDIR)$(PREFIX)$(LIBDIR)/gajim";
        for f in $(FILES_LIB) ; do \
--              cp "$$f" "$(DESTDIR)$(PREFIX)/lib/gajim/"; \
-+              cp "$$f" "$(DESTDIR)$(PREFIX)$(LIBDIR)/gajim/"; \
-       done
-       mkdir -p "$(DESTDIR)$(PREFIX)/bin";
-       for s in $(SCRIPTS) ; do \
+               cp "$$f" "$(DESTDIR)$(PREFIX)$(LIBDIR)/gajim/"; \