diff options
| author | Pawel "l0ner" Soltys <pwslts@gmail.com> | 2012-02-07 20:37:58 +0100 |
|---|---|---|
| committer | Pawel "l0ner" Soltys <pwslts@gmail.com> | 2012-02-07 20:37:58 +0100 |
| commit | 413e1748b4f6634573311f24e9cce4ad099d9f15 (patch) | |
| tree | 453a30388e10d148aa1f05c9dc1f89d6283e8dda /ubuntu/maverick_automake/applications/ktechlab | |
| parent | 79b18e9f0f943ca0c3a60e5c6a24a3a0d0afad5d (diff) | |
| parent | 784405e8180ea3d82b9c983dc6980b395a10099b (diff) | |
| download | tde-packaging-413e1748b4f6634573311f24e9cce4ad099d9f15.tar.gz tde-packaging-413e1748b4f6634573311f24e9cce4ad099d9f15.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick_automake/applications/ktechlab')
| -rw-r--r-- | ubuntu/maverick_automake/applications/ktechlab/debian/debiandirs | 2 | ||||
| -rwxr-xr-x | ubuntu/maverick_automake/applications/ktechlab/debian/rules | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ubuntu/maverick_automake/applications/ktechlab/debian/debiandirs b/ubuntu/maverick_automake/applications/ktechlab/debian/debiandirs index 22305506e..c43770893 100644 --- a/ubuntu/maverick_automake/applications/ktechlab/debian/debiandirs +++ b/ubuntu/maverick_automake/applications/ktechlab/debian/debiandirs @@ -1,7 +1,7 @@ export kde_confdir=/etc/kde3 export kde_prefix=/opt/kde3 export kde_bindir=/opt/kde3/bin -export kde_includedir=/opt/kde3/include/kde +export kde_includedir=/opt/kde3/include/tde export kde_libdir=/opt/kde3/lib export kde_cgidir=/opt/kde3/lib/cgi-bin export kde_moduledir=/opt/kde3/lib/kde3 diff --git a/ubuntu/maverick_automake/applications/ktechlab/debian/rules b/ubuntu/maverick_automake/applications/ktechlab/debian/rules index 6a006f9b9..148f5d807 100755 --- a/ubuntu/maverick_automake/applications/ktechlab/debian/rules +++ b/ubuntu/maverick_automake/applications/ktechlab/debian/rules @@ -5,7 +5,7 @@ -include debian/debiandirs -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 @@ -45,7 +45,7 @@ endif ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif - PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/kde3 + PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/kde3 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/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 clean: @@ -85,8 +85,8 @@ install: build dh_testroot dh_clean -k dh_installdirs - env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/ktechlab-kde3 - env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) -C po install DESTDIR=$(CURDIR)/debian/ktechlab-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/ktechlab-kde3 + env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE) -C po install DESTDIR=$(CURDIR)/debian/ktechlab-kde3 install -D -m 644 debian/ktechlab.xpm debian/ktechlab-kde3/opt/kde3/share/pixmaps/ktechlab.xpm chrpath -d $(CURDIR)/debian/ktechlab-kde3/opt/kde3/bin/ktechlab chrpath -d $(CURDIR)/debian/ktechlab-kde3/opt/kde3/bin/microbe |