From 784405e8180ea3d82b9c983dc6980b395a10099b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 7 Feb 2012 13:25:53 -0600 Subject: Update Debian and Ubuntu packaging files for new TDE include directory name --- ubuntu/lucid_automake/applications/kmyfirewall/debian/debiandirs | 2 +- ubuntu/lucid_automake/applications/kmyfirewall/debian/rules | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'ubuntu/lucid_automake/applications/kmyfirewall/debian') diff --git a/ubuntu/lucid_automake/applications/kmyfirewall/debian/debiandirs b/ubuntu/lucid_automake/applications/kmyfirewall/debian/debiandirs index 0fb38ea11..3f7ee894a 100644 --- a/ubuntu/lucid_automake/applications/kmyfirewall/debian/debiandirs +++ b/ubuntu/lucid_automake/applications/kmyfirewall/debian/debiandirs @@ -1,6 +1,6 @@ export kde_prefix=/usr export sysconfdir=/etc -export kde_includedir=/usr/include/kde +export kde_includedir=/usr/include/tde export infodir=/usr/share/info export mandir=/usr/share/man export qtdir=/usr/share/qt3 diff --git a/ubuntu/lucid_automake/applications/kmyfirewall/debian/rules b/ubuntu/lucid_automake/applications/kmyfirewall/debian/rules index e0333883c..61ad9e5cb 100755 --- a/ubuntu/lucid_automake/applications/kmyfirewall/debian/rules +++ b/ubuntu/lucid_automake/applications/kmyfirewall/debian/rules @@ -6,7 +6,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde DEB_CONFIGURE_MANDIR := /opt/kde3/share/man DEB_CONFIGURE_PREFIX := /opt/kde3 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info @@ -56,7 +56,7 @@ endif ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif - CFLAGS="$(CFLAGS)" PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde + CFLAGS="$(CFLAGS)" PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde build: build-stamp @@ -65,7 +65,7 @@ build-stamp: config.status dh_testdir # Add here commands to compile the package. - env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) + env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE) touch build-stamp @@ -94,7 +94,7 @@ install: build dh_clean -k # Add here commands to install the package into debian/kmyfirewall. - env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/kmyfirewall-kde3 + env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/kmyfirewall-kde3 rm -f debian/kmyfirewall-kde3/opt/kde3/lib/*.so chrpath -d debian/kmyfirewall-kde3/opt/kde3/bin/kmyfirewall debian/kmyfirewall-kde3/opt/kde3/lib/*.so.* debian/kmyfirewall-kde3/opt/kde3/lib/kde3/*.so -- cgit v1.2.1