17 files changed, 17 insertions, 17 deletions

diff --git a/libopie/libopie1.control b/libopie/libopie1.control
index 07aafb2..e62f59f 100644
--- a/libopie/libopie1.control
+++ b/libopie/libopie1.control
@@ -1,10 +1,10 @@
-Files: $QTDIR/lib/libopie.so.1.0.0 $QTDIR/lib/libopie.so.1.0 $QTDIR/lib/libopie.so.1
+Files: $OPIEDIR/lib/libopie.so.1.0.0 $OPIEDIR/lib/libopie.so.1.0 $OPIEDIR/lib/libopie.so.1
 Priority: optional
 Section: opie/system
 Maintainer: - 
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.1
 Depends: qt-embedded (>=$QTE_VERSION)
 Provides: libopie
 Replaces: libopie
 Description: Opie library
diff --git a/libopie/ofileselector/libopie.pro b/libopie/ofileselector/libopie.pro
index 4d1b5cf..cf22b5e 100644
--- a/libopie/ofileselector/libopie.pro
+++ b/libopie/ofileselector/libopie.pro
@@ -65,25 +65,25 @@ SOURCES   = ofontmenu.cc  \
              pim/otodoaccess.cpp \
              pim/otodoaccessbackend.cpp \
              pim/otodoaccessxml.cpp \
              pim/ocontact.cpp \
              pim/ocontactaccess.cpp \
              pim/otodoaccessvcal.cpp \
              pim/orecur.cpp \
              orecurrancewidget.cpp
 #             pim/otodoaccesssql.cpp \
 
 TARGET    = opie
 INCLUDEPATH += $(OPIEDIR)/include
-DESTDIR      = $(QTDIR)/lib$(PROJMAK)
+DESTDIR      = $(OPIEDIR)/lib$(PROJMAK)
 #VERSION = 1.0.0
 
 # LIBS            += -lopiesql
 
 INTERFACES      = otimepickerbase.ui orecurrancebase.ui
 
 TRANSLATIONS = ../i18n/de/libopie.ts \
          ../i18n/xx/libopie.ts \
    ../i18n/en/libopie.ts \
    ../i18n/es/libopie.ts \
    ../i18n/fr/libopie.ts \
    ../i18n/hu/libopie.ts \
diff --git a/libopie/pim/libopie.pro b/libopie/pim/libopie.pro
index bec595c..b1ec9f7 100644
--- a/libopie/pim/libopie.pro
+++ b/libopie/pim/libopie.pro
@@ -47,25 +47,25 @@ SOURCES   = ofontmenu.cc  \
              ofileselector/olocallister.cpp \
              ofileselector/ofileselectormain.cpp \
              pim/otodo.cpp \
              pim/opimrecord.cpp \
              pim/otodoaccess.cpp \
              pim/otodoaccessbackend.cpp \
              pim/ocontact.cpp \
              pim/ocontactaccess.cpp \
              pim/orecord.cpp
 
 TARGET    = opie
 INCLUDEPATH += $(OPIEDIR)/include
-DESTDIR      = $(QTDIR)/lib$(PROJMAK)
+DESTDIR      = $(OPIEDIR)/lib$(PROJMAK)
 #VERSION = 1.0.0
 
 INTERFACES      = otimepickerbase.ui
 
 TRANSLATIONS = ../i18n/de/libopie.ts \
          ../i18n/xx/libopie.ts \
    ../i18n/en/libopie.ts \
    ../i18n/es/libopie.ts \
    ../i18n/fr/libopie.ts \
    ../i18n/hu/libopie.ts \
    ../i18n/ja/libopie.ts \
    ../i18n/ko/libopie.ts \
diff --git a/libsql/libopiesql.pro b/libsql/libopiesql.pro
index a31190e..4fc6cc7 100644
--- a/libsql/libopiesql.pro
+++ b/libsql/libopiesql.pro
@@ -12,20 +12,20 @@ HEADERS 	= osqlbackend.h \
         SOURCES         = osqlbackend.cpp \
                   osqldriver.cpp \
                   osqlerror.cpp \
                   osqlmanager.cpp \
                   osqlquery.cpp \
                   osqlresult.cpp \
                   osqltable.cpp \
                   osqlbackendmanager.cpp \
                   osqlitedriver.cpp
 
         TARGET  = opiesql
 INCLUDEPATH += $(OPIEDIR)/include
-DESTDIR         = $(QTDIR)/lib$(PROJMAK)
+DESTDIR      = $(OPIEDIR)/lib$(PROJMAK)
 LIBS += -lsqlite
 #VERSION = 1.0.0
 
 
 
 
 include ( ../include.pro )
diff --git a/noncore/apps/tinykate/libkate/libkate.pro b/noncore/apps/tinykate/libkate/libkate.pro
index fdae834..a78351a 100644
--- a/noncore/apps/tinykate/libkate/libkate.pro
+++ b/noncore/apps/tinykate/libkate/libkate.pro
@@ -77,18 +77,18 @@ SOURCES		= microkde/kapplication.cpp \
         INTERFACES= 
         INCLUDEPATH+= $(OPIEDIR)/include $(OPIEDIR)/noncore/apps/tinykate/libkate/microkde \
                         $(OPIEDIR)/noncore/apps/tinykate/libkate/document \
                         $(OPIEDIR)/noncore/apps/tinykate/libkate/view \
                         $(OPIEDIR)/noncore/apps/tinykate/libkate/interfaces \
                         $(OPIEDIR)/noncore/apps/tinykate/libkate/ktexteditor \
                         $(OPIEDIR)/noncore/apps/tinykate/libkate/qt3back
         DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopie
         TARGET  = tinykate
 
 INCLUDEPATH += $(OPIEDIR)/include
-DESTDIR      = $(QTDIR)/lib$(PROJMAK)
+DESTDIR      = $(OPIEDIR)/lib$(PROJMAK)
 
 
 
 
 include ( ../../../../include.pro )
diff --git a/noncore/net/ftplib/ftplib.control b/noncore/net/ftplib/ftplib.control
index 67765ad..72b004e 100644
--- a/noncore/net/ftplib/ftplib.control
+++ b/noncore/net/ftplib/ftplib.control
@@ -1,9 +1,9 @@
-Files: $QTDIR/lib/libftplib.*
+Files: $OPIEDIR/lib/libftplib.*
 Priority: optional
 Section: Communications
 Maintainer: L.J. Potter <ljp@llornkcor.com> 
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: Libftp
  The ftp library for the Opie environment.
diff --git a/noncore/net/ftplib/ftplib.pro b/noncore/net/ftplib/ftplib.pro
index 3dd8dbd..918ddf9 100644
--- a/noncore/net/ftplib/ftplib.pro
+++ b/noncore/net/ftplib/ftplib.pro
@@ -1,10 +1,10 @@
 TEMPLATE  = lib
 CONFIG    = qt warn_on release
 HEADERS   = ftplib.h
 SOURCES   = ftplib.c
-DESTDIR      = $(QTDIR)/lib$(PROJMAK)
+DESTDIR      = $(OPIEDIR)/lib$(PROJMAK)
 INTERFACES  = 
 
 
 
 include ( ../../../include.pro )
diff --git a/noncore/net/opietooth/lib/lib.pro b/noncore/net/opietooth/lib/lib.pro
index d250448..a021941 100644
--- a/noncore/net/opietooth/lib/lib.pro
+++ b/noncore/net/opietooth/lib/lib.pro
@@ -1,19 +1,19 @@
 TEMPLATE        = lib
 CONFIG          += qte warn_on release
         HEADERS = connection.h parser.h device.h manager.h remotedevice.h services.h
         SOURCES         = connection.cpp parser.cc device.cc manager.cc remotedevice.cc services.cc
         TARGET  = opietooth
 INCLUDEPATH += $(OPIEDIR)/include .
-DESTDIR         = $(QTDIR)/lib$(PROJMAK)
+        DESTDIR         = $(OPIEDIR)/lib$(PROJMAK)
 LIBS += -lopie
 #VERSION = 0.0.0
 
 TRANSLATIONS = ../../../../i18n/de/libopietooth.ts \
          ../../../../i18n/da/libopietooth.ts \
          ../../../../i18n/xx/libopietooth.ts \
          ../../../../i18n/en/libopietooth.ts \
          ../../../../i18n/es/libopietooth.ts \
          ../../../../i18n/fr/libopietooth.ts \
          ../../../../i18n/hu/libopietooth.ts \
          ../../../../i18n/ja/libopietooth.ts \
          ../../../../i18n/ko/libopietooth.ts \
diff --git a/noncore/net/opietooth/lib/libopietooth.control b/noncore/net/opietooth/lib/libopietooth.control
index bdc43b1..1ecb2b6 100644
--- a/noncore/net/opietooth/lib/libopietooth.control
+++ b/noncore/net/opietooth/lib/libopietooth.control
@@ -1,8 +1,8 @@
-Files: $QTDIR/lib/libopie11tooth.so.1.0.0 $QTDIR/lib/libopie11tooth.so.1.0 $QTDIR/lib/libopie11tooth.so.1 
+Files: $OPIEDIR/lib/libopie11tooth.so.1.0.0 $OPIEDIR/lib/libopie11tooth.so.1.0 $OPIEDIR/lib/libopie11tooth.so.1 
 Priority: optional
 Section: opie/system
 Maintainer: Maximilian Reiß <max.reiss@gmx.de>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: qt-embedded (>=$QTE_VERSION), libopie11, task-bluez
 Description: Opie bluetooth library
diff --git a/noncore/net/wellenreiter/daemon/daemon.pro b/noncore/net/wellenreiter/daemon/daemon.pro
index 5f4d09b..2599315 100644
--- a/noncore/net/wellenreiter/daemon/daemon.pro
+++ b/noncore/net/wellenreiter/daemon/daemon.pro
@@ -1,15 +1,15 @@
 DESTDIR         = $(OPIEDIR)/bin
 TEMPLATE        = app
 CONFIG          = warn_on debug
 #CONFIG         = warn_on release
 HEADERS         = source/config.hh source/daemon.hh
 SOURCES         = source/daemon.cc
 INCLUDEPATH     += ../
 DEPENDPATH      += $(OPIEDIR)/include
-LIBS            += -lpcap -L$(QTDIR)/lib -lwellenreiter
+LIBS            += -lpcap -L$(OPIEDIR)/lib -lwellenreiter
 INTERFACES      = 
 TARGET          = wellenreiterd
 
 
 
 include ( ../../../../include.pro )
diff --git a/noncore/net/wellenreiter/libwellenreiter/libwellenreiter.pro b/noncore/net/wellenreiter/libwellenreiter/libwellenreiter.pro
index 5a7e20d..fd3b894 100644
--- a/noncore/net/wellenreiter/libwellenreiter/libwellenreiter.pro
+++ b/noncore/net/wellenreiter/libwellenreiter/libwellenreiter.pro
@@ -1,15 +1,15 @@
 TEMPLATE = lib
 CONFIG = warn_on debug
 VERSION = 0.2
 HEADERS = source/cardmode.hh source/wl_log.hh source/wl_proto.hh source/sniff.hh source/wl_sock.hh source/wl_types.hh
 SOURCES = source/cardmode.cc source/wl_log.cc source/wl_proto.cc source/sniff.cc source/wl_sock.cc
 
 LIBS =
 TMAKE_CFLAGS += -D__UNIX__
 
-DESTDIR = $(QTDIR)/lib
+DESTDIR = $(OPIEDIR)/lib
 TARGET = wellenreiter
 
 
 
 include ( ../../../../include.pro )
diff --git a/noncore/net/wellenreiter/opie-wellenreiter.control b/noncore/net/wellenreiter/opie-wellenreiter.control
index 0ea27bf..299dfc0 100644
--- a/noncore/net/wellenreiter/opie-wellenreiter.control
+++ b/noncore/net/wellenreiter/opie-wellenreiter.control
@@ -1,9 +1,9 @@
-Files: bin/wellenreiter bin/wellenreiterd bin/orinoco_hopper pics/wellenreiter apps/Applications/wellenreiter.desktop $QTDIR/lib/libwellenreiter.*
+Files: bin/wellenreiter bin/wellenreiterd bin/orinoco_hopper pics/wellenreiter apps/Applications/wellenreiter.desktop $OPIEDIR/lib/libwellenreiter.*
 Priority: optional
 Section: opie/applications
 Maintainer: Michael Lauer <mickeyl@handhelds.org> 
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION), libpcap
 Description: A WaveLAN Network Monitor
  A WaveLAN Network Monitor/Sniffer for the Opie Environment.
diff --git a/noncore/settings/networksettings/interfaces/interfaces.pro b/noncore/settings/networksettings/interfaces/interfaces.pro
index 9fd1b20..233cacd 100644
--- a/noncore/settings/networksettings/interfaces/interfaces.pro
+++ b/noncore/settings/networksettings/interfaces/interfaces.pro
@@ -1,16 +1,16 @@
 TEMPLATE        = lib
 CONFIG          += qt warn_on release
         #CONFIG         += qt warn_on debug
-        DESTDIR         = $(QTDIR)/lib$(PROJMAK)
+        DESTDIR         = $(OPIEDIR)/lib$(PROJMAK)
         HEADERS         = interface.h  interfaceinformationimp.h  interfaces.h  interfacesetupimp.h
         SOURCES         = interface.cpp interfaces.cpp interfaceinformationimp.cpp  interfacesetupimp.cpp
         INCLUDEPATH+= $(OPIEDIR)/include ../
         DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
         INTERFACES= interfaceadvanced.ui  interfaceinformation.ui  interfacesetup.ui
         TARGET  = interfaces
         VERSION         = 1.0.0
 
 
 
 include ( ../../../../include.pro )
diff --git a/noncore/settings/networksettings/opie-networksettings.control b/noncore/settings/networksettings/opie-networksettings.control
index 7635cd1..a19af54 100644
--- a/noncore/settings/networksettings/opie-networksettings.control
+++ b/noncore/settings/networksettings/opie-networksettings.control
@@ -1,9 +1,9 @@
-Files: bin/networksettings apps/Settings/networksettings.desktop plugins/networksettings/* pics/networksettings/* pics/Network/PPPConnect.png $QTDIR/lib/libinterfaces.so.1.0.0 $QTDIR/lib/libinterfaces.so.1.0 $QTDIR/lib/libinterfaces.so.1 root/usr/bin/changedns bin/getprofile
+Files: bin/networksettings apps/Settings/networksettings.desktop plugins/networksettings/* pics/networksettings/* pics/Network/PPPConnect.png $OPIEDIR/lib/libinterfaces.so.1.0.0 $OPIEDIR/lib/libinterfaces.so.1.0 $OPIEDIR/lib/libinterfaces.so.1 root/usr/bin/changedns bin/getprofile
 Priority: optional
 Section: opie/settings
 Maintainer: Ben Meyer <meyerb@sharpsec.com> 
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: Network settings.
 Replaces: opie-networksetup
diff --git a/noncore/unsupported/mail2/libmail/libmail.pro b/noncore/unsupported/mail2/libmail/libmail.pro
index 1d5a4c1..05a9773 100644
--- a/noncore/unsupported/mail2/libmail/libmail.pro
+++ b/noncore/unsupported/mail2/libmail/libmail.pro
@@ -12,25 +12,25 @@ HEADERS		=	configfile.h \
                         smtphandler.h
         SOURCES                 =configfile.cpp \
                         imapbase.cpp \
                         imaphandler.cpp \
                         imapresponse.cpp \
                         mailfactory.cpp \
                         md5.h \
                         miscfunctions.cpp \
                         smtphandler.cpp
         INCLUDEPATH     +=$(OPIEDIR)/include
         LIBS            +=-L$(OPIEDIR)/lib -lqpe
         TARGET          =mail
-        DESTDIR                 =$(QTDIR)/lib
+DESTDIR      = $(OPIEDIR)/lib
 
 TRANSLATIONS = ../../../i18n/de/libmail.ts \
          ../../../i18n/da/libmail.ts \
          ../../../i18n/xx/libmail.ts \
          ../../../i18n/en/libmail.ts \
          ../../../i18n/es/libmail.ts \
          ../../../i18n/fr/libmail.ts \
          ../../../i18n/hu/libmail.ts \
          ../../../i18n/ja/libmail.ts \
          ../../../i18n/ko/libmail.ts \
          ../../../i18n/no/libmail.ts \
          ../../../i18n/pl/libmail.ts \
diff --git a/noncore/unsupported/mail2/opie-mail2.control b/noncore/unsupported/mail2/opie-mail2.control
index b6bbff8..2a6529f 100644
--- a/noncore/unsupported/mail2/opie-mail2.control
+++ b/noncore/unsupported/mail2/opie-mail2.control
@@ -1,9 +1,9 @@
-Files: bin/mail $QTDIR/lib/libmail.so* apps/1Pim/mail.desktop pics/mail/*.png sounds/mail/*.wav
+Files: bin/mail $OPIEDIR/lib/libmail.so* apps/1Pim/mail.desktop pics/mail/*.png sounds/mail/*.wav
 Priority: optional
 Section: opie/applications
 Maintainer: Constantin Bergemann <cbergemann@lisa.de>
 Architecture: arm
 Version: 0.0.9-$SUB_VERSION
 Depends: opie-base, libopie1
 Description: An IMAP mail client
 License: LGPL
diff --git a/x11/libqpe-x11/libqpe-x11.pro b/x11/libqpe-x11/libqpe-x11.pro
index 1671ffa..b61ba3f 100644
--- a/x11/libqpe-x11/libqpe-x11.pro
+++ b/x11/libqpe-x11/libqpe-x11.pro
@@ -128,20 +128,20 @@ SOURCES +=  ../../library/quuid.cpp \
             ../../library/qlibrary.cpp \
             ../../library/qlibrary_unix.cpp
 
 INCLUDEPATH += $(OPIEDIR)/include backend
         LIBS    += -ldl -lcrypt -lm
 
 INTERFACES =  ../../library/passwordbase_p.ui \
               ../../library/categoryeditbase_p.ui \
               ../../library/findwidgetbase_p.ui \
               ../../library/lnkpropertiesbase_p.ui
 
         TARGET  = qpe
-        DESTDIR         = $(QTDIR)/lib$(PROJMAK)
+        DESTDIR         = $(OPIEDIR)/lib$(PROJMAK)
 # This is set by configure$(OPIEDIR).
         VERSION         = 1.5.0.1
 
 
 
 
 include ( ../../include.pro )