Bug#194108: Oooops, real patches now

Christian Marillat Christian Marillat <marillat@debian.org>, 194108@bugs.debian.org
Tue, 30 Dec 2003 14:35:15 +0100


tags 194108 - help
tags 194108 + patch
thanks

Hi,

My previous patches was not tested with pbuilder. These patches are working.

Christian

In debian/rules just after $(MAKE) in build target

        $(MAKE)

        perl -i -pe 's,-lglib-2.0,-lglib-2.0 $(CURDIR)/lib/libgtop-2.0.la,' sysdeps/common/Makefile
        rm sysdeps/common/*.lo

        $(MAKE) -C sysdeps/common

        perl -i -pe 's,-lglib-2.0,-lglib-2.0 $(CURDIR)/lib/libgtop-2.0.la,' sysdeps/linux/Makefile
        rm sysdeps/linux/*.lo

        $(MAKE) -C sysdeps/linux

        touch build-stamp

,----
| --- libgtop2-2.0.8.orig/sysdeps/common/Makefile.in
| +++ libgtop2-2.0.8/sysdeps/common/Makefile.in
| @@ -160,7 +160,7 @@
|                                   $(inodedb_SRCLIST)
|  
|  
| -libgtop_common_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
| +libgtop_common_2_0_la_LDFLAGS = $(LT_VERSION_INFO) -L`pwd`/../../lib/.libs
|  libgtop_common_2_0_la_LIBADD = $(LIBGTOP_EXTRA_LIBS)
|  
|  libgtop_suid_common_2_0_la_SOURCES = xmalloc.c error.c sysdeps_suid.c
`----

,----
| --- libgtop2-2.0.8.orig/sysdeps/linux/Makefile.in
| +++ libgtop2-2.0.8/sysdeps/linux/Makefile.in
| @@ -158,7 +158,7 @@
|  
|  libgtop_sysdeps_2_0_la_LIBADD = @GLIB_LIBS@
|  
| -libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
| +libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) -L`pwd`/../../lib/.libs
|  
|  libgtopinclude_HEADERS = glibtop_server.h glibtop_machine.h
|  libgtopincludedir = $(includedir)/libgtop-2.0
`----