[SCM] aeolus packaging branch, master, updated. debian/0.8.2-3-11-g1cd7784

[quadrispro-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1cd77840c3d5b3ffbdb3f17c0a13b044045801dc
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Sat Apr 17 20:46:46 2010 +0200

    Adjust makefile patch.

diff --git a/debian/patches/01-makefile.patch b/debian/patches/01-makefile.patch
index cb3a927..e2dfd57 100644
--- a/debian/patches/01-makefile.patch
+++ b/debian/patches/01-makefile.patch
@@ -1,6 +1,8 @@
+Author: Alessio Treglia <quadrispro at ubuntu.com>
+Description: Add DESTDIR, adjust PREFIX and append SONAME to the libraries.
 ---
- source/Makefile |   24 ++++++++++++++++--------
- 1 file changed, 16 insertions(+), 8 deletions(-)
+ source/Makefile |   22 ++++++++++++++--------
+ 1 file changed, 14 insertions(+), 8 deletions(-)
 
 --- aeolus.orig/source/Makefile
 +++ aeolus/source/Makefile
@@ -23,25 +25,21 @@
  
  all:	aeolus aeolus_x11.so aeolus_txt.so
  
-@@ -44,7 +47,9 @@ aeolus_x11.so:	CPPFLAGS += -fpic -D_REEN
+@@ -44,7 +47,7 @@ aeolus_x11.so:	CPPFLAGS += -fpic -D_REEN
  aeolus_x11.so:	LDLIBS += -lclthreads -lclxclient -lXft -lX11
  aeolus_x11.so:	LDFLAGS += -shared -L$(PREFIX)/$(LIBDIR) -L/usr/X11R6/$(LIBDIR)
  aeolus_x11.so: $(XIFACE_O) $(LIBCLX)
 -	g++ $(LDFLAGS) -o $@ $(XIFACE_O) $(LDLIBS)
 +	g++ $(LDFLAGS) -Wl,-soname=$(@).$(MAJ) -o $(@).$(MAJ).$(REL) $(XIFACE_O) $(LDLIBS)
-+	ln -s $(@).$(MAJ).$(REL) $(@).$(MAJ)
-+	ln -s $(@).$(MAJ).$(REL) $(@)
  
  $(XIFACE_O):
  -include $(XIFACE_O:%.o=%.d)
-@@ -55,17 +60,20 @@ aeolus_txt.so:	CPPFLAGS += -fpic -D_REEN
+@@ -55,17 +58,20 @@ aeolus_txt.so:	CPPFLAGS += -fpic -D_REEN
  aeolus_txt.so:	LDLIBS += -lclthreads -lreadline
  aeolus_txt.so:	LDFLAGS += -shared -L$(PREFIX)/$(LIBDIR)
  aeolus_txt.so: $(TIFACE_O)
 -	g++ $(LDFLAGS) -o $@ $(TIFACE_O) $(LDLIBS)
 +	g++ $(LDFLAGS) -Wl,-soname=$(@).$(MAJ) -o $(@).$(MAJ).$(REL) $(TIFACE_O) $(LDLIBS)
-+	ln -s $(@).$(MAJ).$(REL) $(@).$(MAJ)
-+	ln -s $(@).$(MAJ).$(REL) $(@)
  
  $(TIFACE_O):
  -include $(TIFACE_O:%.o=%.d)
@@ -56,7 +54,9 @@
 +	/usr/bin/install -d $(DESTDIR)$(PREFIX)/bin
 +	/usr/bin/install -m 755 aeolus $(DESTDIR)$(PREFIX)/bin
 +	/usr/bin/install -m 755 aeolus_x11.so.$(MAJ).$(REL) $(DESTDIR)$(PREFIX)/$(LIBDIR)
++	ln -s aeolus_x11.so.$(MAJ).$(REL) $(DESTDIR)$(PREFIX)/$(LIBDIR)/aeolus_x11.so.$(MAJ)
 +	/usr/bin/install -m 755 aeolus_txt.so.$(MAJ).$(REL) $(DESTDIR)$(PREFIX)/$(LIBDIR)
++	ln -s aeolus_txt.so.$(MAJ).$(REL) $(DESTDIR)$(PREFIX)/$(LIBDIR)/aeolus_txt.so.$(MAJ)
  
  
  clean:

-- 
aeolus packaging