From: Luciano Montanaro Date: Mon, 27 Jun 2011 20:27:35 +0000 (+0200) Subject: tweaked application.pro, rules files X-Git-Tag: tags/0.4.1~17 X-Git-Url: http://git.maemo.org/git/?a=commitdiff_plain;h=d0b17609524b17fbe1eff751945a1553ef379dd2;p=quandoparte tweaked application.pro, rules files --- diff --git a/application/application.pro b/application/application.pro index 0cebf84..e34e3ec 100644 --- a/application/application.pro +++ b/application/application.pro @@ -4,8 +4,8 @@ # #------------------------------------------------- -CONFIG += qt webkit mobility QT += webkit network maemo5 +CONFIG += qt webkit mobility MOBILITY = location TARGET = quandoparte @@ -54,8 +54,6 @@ OTHER_FILES += \ $$replace(TRANSLATIONS, .ts, .qm) \ resources/stations/stations.qpl -message($${OTHER_FILES}) - unix { isEmpty(PREFIX) { maemo5 { @@ -69,6 +67,7 @@ unix { DEFINES += DATADIR=\\\"$$DATADIR\\\" PKGDATADIR=\\\"$$PKGDATADIR\\\" } +message(Installing to prefix $$PREFIX) unix:!symbian { target.path = $$BINDIR diff --git a/qtc_packaging/debian_fremantle/rules b/qtc_packaging/debian_fremantle/rules index 49be82f..f49c7f6 100755 --- a/qtc_packaging/debian_fremantle/rules +++ b/qtc_packaging/debian_fremantle/rules @@ -16,30 +16,24 @@ configure: configure-stamp configure-stamp: dh_testdir - #qmake PREFIX=/usr# Uncomment this line for use without Qt Creator - + #qmake-qt4 #PREFIX=/usr# Uncomment this line for use without Qt Creator touch configure-stamp - build: build-stamp build-stamp: configure-stamp dh_testdir - # Add here commands to compile the package. #$(MAKE) # Uncomment this line for use without Qt Creator #docbook-to-man debian/quandoparte.sgml > quandoparte.1 - touch $@ clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp - # Add here commands to clean up after the build process. $(MAKE) clean - dh_clean install: build @@ -47,7 +41,6 @@ install: build dh_testroot dh_clean -k dh_installdirs - # Add here commands to install the package into debian/quandoparte. $(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/quandoparte install