X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=debian%2Frules;h=6248301bb896a33caa9eb94dc887ac08b6c9c748;hb=2a901ede69df3069e2ec8bbaee0a677605e6aa2c;hp=0af3df8bd1cb53b6c9a4f55528ec6fc9f5f78b3a;hpb=8e4c1dcc44c78f4fabcdc95810120e18f62abae9;p=presencevnc

diff --git a/debian/rules b/debian/rules
index 0af3df8..6248301 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,14 +11,13 @@ SOURCEDIR=./
 BUILDDIR=debian/build/
 ICONDIR=usr/share/icons/hicolor/
 BINDIR=usr/bin/
-RESDIR=opt/presencevnc/
 DESKTOP_DIR=usr/share/applications/hildon/
 
 build:
 	dh_testdir
 	install -d ${BUILDDIR}
 ifdef buildlibs
-	cd libvnc && ./configure && make
+	cd libvnc && ./configure && cd libvncclient && make
 endif
 	qmake-qt4 -after "DESTDIR=debian/build"
 	$(MAKE)
@@ -30,7 +29,7 @@ clean:
 	rm -f build
 	[ ! -f Makefile ] || $(MAKE) clean
 ifdef buildlibs
-	[ ! -f libvnc/Makefile ] || cd libvnc && make clean
+	[ ! -f libvnc/Makefile ] || ( cd libvnc && make clean )
 endif
 	dh_clean
 	rm -rf ${BUILDDIR}
@@ -46,7 +45,7 @@ binary-arch: build install
 	dh_compress
 	dh_fixperms
 	dh_installdeb
-	LD_LIBRARY_PATH=debian/presencevnc/${RESDIR} dh_shlibdeps -l debian/presencevnc/${RESDIR}
+	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
@@ -57,11 +56,8 @@ install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_installdirs ${BINDIR} $(RESDIR)
-	dh_install libvnc/libvncclient/.libs/libvncclient.so.0.0.0 ${RESDIR}
-	mv debian/presencevnc/${RESDIR}libvncclient.so.0.0.0 debian/presencevnc/${RESDIR}libvncclient.so.0
-	dh_install ${BUILDDIR}presencevnc-bin ${RESDIR}
-	dh_install presencevnc ${BINDIR}
+	dh_installdirs ${BINDIR}
+	dh_install ${BUILDDIR}presencevnc ${BINDIR}
 	dh_install presencevnc.desktop $(DESKTOP_DIR)
 	dh_install icons/48x48/presencevnc.png $(ICONDIR)48x48/apps
 	dh_install icons/64x64/presencevnc.png $(ICONDIR)64x64/apps