opiedir/lib instead of qtdir/lib..

4 files changed, 3 insertions, 11 deletions

diff --git a/lib/README b/lib/README
new file mode 100644
index 0000000..48cdce8
--- a/dev/null
+++ b/lib/README
@@ -0,0 +1 @@
+placeholder
diff --git a/libopie/libopie.control b/libopie/libopie.control
deleted file mode 100644
index 6bf3883..0000000
--- a/libopie/libopie.control
+++ b/dev/null
@@ -1,8 +0,0 @@
-Files: $QTDIR/lib/libopie.so.1.0.0 $QTDIR/lib/libopie.so.1.0 $QTDIR/lib/libopie.so.1 pics/opie/*
-Priority: optional
-Section: opie/system
-Maintainer: - 
-Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
-Depends: qt-embedded (>=$QTE_VERSION)
-Description: Opie library
diff --git a/libopie/libopie.pro b/libopie/libopie.pro
index a2d8faa..799f3b0 100644
--- a/libopie/libopie.pro
+++ b/libopie/libopie.pro
@@ -64,33 +64,33 @@ SOURCES   = ofontmenu.cc  \
        pim/orecur.cpp \
        pim/opimstate.cpp \
        pim/opimxrefpartner.cpp \
        pim/opimxref.cpp \
        pim/opimxrefmanager.cpp \
        pim/opimmaintainer.cpp \
        pim/opimnotify.cpp \
        pim/opimnotifymanager.cpp \
        pim/opimmainwindow.cpp \
        pim/opimresolver.cpp \
        orecurrancewidget.cpp \
        oticker.cpp
 #             pim/otodoaccesssql.cpp \
 
 TARGET    = opie
 INCLUDEPATH += $(OPIEDIR)/include
-DESTDIR      = $(QTDIR)/lib$(PROJMAK)
+DESTDIR      = $(OPIEDIR)/lib$(PROJMAK)
 #VERSION = 1.0.0
 
 LIBS += -lqpe
 
 # 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 \
    ../i18n/ja/libopie.ts \
    ../i18n/ko/libopie.ts \
diff --git a/library/library.pro b/library/library.pro
index a04d3f0..b0d07b8 100644
--- a/library/library.pro
+++ b/library/library.pro
@@ -111,34 +111,33 @@ SOURCES	=   calendar.cpp \
         categorywidget.cpp \
         ir.cpp \
         backend/vcc_yacc.cpp \
         backend/vobject.cpp \
         findwidget_p.cpp \
         finddialog.cpp \
         lnkproperties.cpp \
         qt_override.cpp
 
 # Qt 3 compatibility
 HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h
 SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp
 INCLUDEPATH += $(OPIEDIR)/include backend
         LIBS    += -ldl -lcrypt -lm
 INTERFACES = passwordbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui
         TARGET  = qpe
-        DESTDIR         = $(QTDIR)/lib$(PROJMAK)
-# This is set by configure$(OPIEDIR).
+        DESTDIR         = $(OPIEDIR)/lib$(PROJMAK)
         VERSION         = 1.5.0.1
 
 TRANSLATIONS = ../i18n/de/libqpe.ts \
          ../i18n/xx/libqpe.ts \
          ../i18n/en/libqpe.ts \
          ../i18n/es/libqpe.ts \
          ../i18n/fr/libqpe.ts \
          ../i18n/hu/libqpe.ts \
          ../i18n/ja/libqpe.ts \
          ../i18n/ko/libqpe.ts \
          ../i18n/no/libqpe.ts \
          ../i18n/pl/libqpe.ts \
          ../i18n/pt/libqpe.ts \
          ../i18n/pt_BR/libqpe.ts \
          ../i18n/sl/libqpe.ts \
          ../i18n/zh_CN/libqpe.ts \