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 --- debian/squeeze/applications/ktechlab/debian/debiandirs | 2 +- debian/squeeze/applications/ktechlab/debian/rules | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'debian/squeeze/applications/ktechlab') diff --git a/debian/squeeze/applications/ktechlab/debian/debiandirs b/debian/squeeze/applications/ktechlab/debian/debiandirs index d35ab77aa..dfe8aa8ab 100644 --- a/debian/squeeze/applications/ktechlab/debian/debiandirs +++ b/debian/squeeze/applications/ktechlab/debian/debiandirs @@ -1,7 +1,7 @@ export kde_confdir=/etc/trinity export kde_prefix=/opt/trinity export kde_bindir=/opt/trinity/bin -export kde_includedir=/opt/trinity/include/kde +export kde_includedir=/opt/trinity/include/tde export kde_libdir=/opt/trinity/lib export kde_cgidir=/opt/trinity/lib/cgi-bin export kde_moduledir=/opt/trinity/lib/trinity diff --git a/debian/squeeze/applications/ktechlab/debian/rules b/debian/squeeze/applications/ktechlab/debian/rules index cadc4e546..1e1e53c9c 100755 --- a/debian/squeeze/applications/ktechlab/debian/rules +++ b/debian/squeeze/applications/ktechlab/debian/rules @@ -5,7 +5,7 @@ -include debian/debiandirs -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info @@ -45,7 +45,7 @@ endif ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif - PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity + PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity build: build-stamp debian/ktechlab.xpm @@ -55,7 +55,7 @@ build-stamp: config.status make -f admin/Makefile.common cvs touch debian/stamp-bootstrap - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) + env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) touch build-stamp clean: @@ -85,8 +85,8 @@ install: build dh_testroot dh_clean -k dh_installdirs - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/ktechlab-trinity - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) -C po install DESTDIR=$(CURDIR)/debian/ktechlab-trinity + env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/ktechlab-trinity + env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) -C po install DESTDIR=$(CURDIR)/debian/ktechlab-trinity install -D -m 644 debian/ktechlab.xpm debian/ktechlab-trinity/opt/trinity/share/pixmaps/ktechlab.xpm chrpath -d $(CURDIR)/debian/ktechlab-trinity/opt/trinity/bin/ktechlab chrpath -d $(CURDIR)/debian/ktechlab-trinity/opt/trinity/bin/microbe -- cgit v1.2.1