X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=debian%2Frules;h=dd51d7acd280d436a5d8b2a0152d103e83b24967;hb=6a044a54ef4856fc8de59605dade6d6b7d45701d;hp=df3085fee527e0d6dc3f8c73417b6a96454189ff;hpb=3c170b953a3d8a9d4e8d4085f96736b1d9436b77;p=presencevnc

diff --git a/debian/rules b/debian/rules
index df3085f..dd51d7a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,20 +5,19 @@ export DH_VERBOSE=1
 #currently builds a maemo-only package
 
 #comment this line for quick builds
-buildlibs=foo
+#buildlibs=foo
 
 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)
@@ -29,6 +28,9 @@ clean:
 	dh_testroot
 	rm -f build
 	[ ! -f Makefile ] || $(MAKE) clean
+ifdef buildlibs
+	[ ! -f libvnc/Makefile ] || ( cd libvnc && make clean )
+endif
 	dh_clean
 	rm -rf ${BUILDDIR}
 
@@ -43,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
@@ -54,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