diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-24 17:39:51 -0600 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-08-27 19:46:08 +0200 |
| commit | 6a2f906a28f9656eaba990c1339fcd2452450fae (patch) | |
| tree | b9d28398eafd900223c1e5d2507d78a86391b63a | |
| parent | 5cdf5fa3bc791ad559b8932c5539794334473451 (diff) | |
| download | tde-packaging-6a2f906a28f9656eaba990c1339fcd2452450fae.tar.gz tde-packaging-6a2f906a28f9656eaba990c1339fcd2452450fae.zip | |
Fix kgtk-qt3 FTBFS on Debian and Ubuntu
(cherry picked from commit 26cead648c6fa5b047caf9ff6badaffca17de97d)
| -rwxr-xr-x | debian/lenny/applications/kgtk-qt3/debian/rules | 3 | ||||
| -rwxr-xr-x | debian/squeeze/applications/kgtk-qt3/debian/rules | 3 | ||||
| -rwxr-xr-x | ubuntu/maverick/applications/kgtk-qt3/debian/rules | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/debian/lenny/applications/kgtk-qt3/debian/rules b/debian/lenny/applications/kgtk-qt3/debian/rules index cd79c71f9..1948d86d6 100755 --- a/debian/lenny/applications/kgtk-qt3/debian/rules +++ b/debian/lenny/applications/kgtk-qt3/debian/rules @@ -25,8 +25,7 @@ DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" - # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL = true -install/kgtk-qt3-trinity:: - $(MAKE) install DESTDIR=$(CURDIR)/debian/kgtk-qt3-trinity +binary-install/kgtk-qt3-trinity:: mkdir -p $(CURDIR)/debian/kgtk-qt3-trinity/opt/trinity/share/kgtk/ cp -Rp $(CURDIR)/debian/preload $(CURDIR)/debian/kgtk-qt3-trinity/opt/trinity/share/kgtk/ diff --git a/debian/squeeze/applications/kgtk-qt3/debian/rules b/debian/squeeze/applications/kgtk-qt3/debian/rules index cd79c71f9..1948d86d6 100755 --- a/debian/squeeze/applications/kgtk-qt3/debian/rules +++ b/debian/squeeze/applications/kgtk-qt3/debian/rules @@ -25,8 +25,7 @@ DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" - # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL = true -install/kgtk-qt3-trinity:: - $(MAKE) install DESTDIR=$(CURDIR)/debian/kgtk-qt3-trinity +binary-install/kgtk-qt3-trinity:: mkdir -p $(CURDIR)/debian/kgtk-qt3-trinity/opt/trinity/share/kgtk/ cp -Rp $(CURDIR)/debian/preload $(CURDIR)/debian/kgtk-qt3-trinity/opt/trinity/share/kgtk/ diff --git a/ubuntu/maverick/applications/kgtk-qt3/debian/rules b/ubuntu/maverick/applications/kgtk-qt3/debian/rules index cd79c71f9..1948d86d6 100755 --- a/ubuntu/maverick/applications/kgtk-qt3/debian/rules +++ b/ubuntu/maverick/applications/kgtk-qt3/debian/rules @@ -25,8 +25,7 @@ DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" - # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL = true -install/kgtk-qt3-trinity:: - $(MAKE) install DESTDIR=$(CURDIR)/debian/kgtk-qt3-trinity +binary-install/kgtk-qt3-trinity:: mkdir -p $(CURDIR)/debian/kgtk-qt3-trinity/opt/trinity/share/kgtk/ cp -Rp $(CURDIR)/debian/preload $(CURDIR)/debian/kgtk-qt3-trinity/opt/trinity/share/kgtk/ |