summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-04-29 21:36:05 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-04-29 21:36:05 (GMT)
commitfa41e2adea4ddbb2eb0d05cbfa0dec7e290d55d5 (patch)
treecb23841b9c569acc513c9e0971f775365c48b7ae /Swift/Packaging/Debian/debian/rules
parent0ad85cdec57d49b697215103cc73463eacc76eb5 (diff)
parent27042edc19e393b24e7953c668a7cec820b710d8 (diff)
downloadswift-fa41e2adea4ddbb2eb0d05cbfa0dec7e290d55d5.zip
swift-fa41e2adea4ddbb2eb0d05cbfa0dec7e290d55d5.tar.bz2
Merge branch 'swift-1.x'
* swift-1.x: Build Swiften as a DLL in Debian package. Added versioning to Swiften. Conflicts: BuildTools/Copyrighter.py
Diffstat (limited to 'Swift/Packaging/Debian/debian/rules')
-rwxr-xr-xSwift/Packaging/Debian/debian/rules2
1 files changed, 1 insertions, 1 deletions
diff --git a/Swift/Packaging/Debian/debian/rules b/Swift/Packaging/Debian/debian/rules
index bbda401..0c84852 100755
--- a/Swift/Packaging/Debian/debian/rules
+++ b/Swift/Packaging/Debian/debian/rules
@@ -13,7 +13,7 @@ install: build
dh_testroot
dh_prep
dh_installdirs
- scons optimize=1 debug=1 allow_warnings=1 qt=/usr/share/qt4 docbook_xsl=/usr/share/xml/docbook/stylesheet/docbook-xsl docbook_xml=/usr/share/xml/docbook/schema/dtd/4.5 SWIFT_INSTALLDIR=$(CURDIR)/debian/swift-im/usr $(CURDIR)/debian/swift-im
+ scons $(SCONS_FLAGS) optimize=1 debug=1 allow_warnings=1 swiften_dll=1 qt=/usr/share/qt4 docbook_xsl=/usr/share/xml/docbook/stylesheet/docbook-xsl docbook_xml=/usr/share/xml/docbook/schema/dtd/4.5 SWIFT_INSTALLDIR=$(CURDIR)/debian/swift-im/usr SWIFTEN_INSTALLDIR=$(CURDIR)/debian/swift-im/usr $(CURDIR)/debian/swift-im
#mv $(CURDIR)/debian/swift-im/usr/bin/swift $(CURDIR)/debian/swift-im/usr/bin/swift-im
#mv $(CURDIR)/debian/swift-im/usr/share/pixmaps/swift.xpm $(CURDIR)/debian/swift-im/usr/share/pixmaps/swift-im.xpm
#mv $(CURDIR)/debian/swift-im/usr/share/swift $(CURDIR)/debian/swift-im/usr/share/swift-im