[PC-BSD Commits] r3066 - in pcbsd/trunk: . CrashHandler NetworkManager NetworkManagerAdmin NetworkTray PBIThumbnailCreator PBIdelete PBReg ServiceManager SoundError SystemUpdater XGUISource ethernetconfig kcmPBMsource kcmPBSystem kcmPBUstart kcmPFManager libpcbsd pcbsdusermanager wificonfig

svn at pcbsd.org svn at pcbsd.org
Fri Dec 12 08:32:45 PST 2008


Author: kris
Date: 2008-12-12 08:32:44 -0800 (Fri, 12 Dec 2008)
New Revision: 3066

Removed:
   pcbsd/trunk/PBBattery/
Modified:
   pcbsd/trunk/CrashHandler/CrashHandler.pro
   pcbsd/trunk/NetworkManager/NetworkManager.pro
   pcbsd/trunk/NetworkManagerAdmin/NetworkManagerAdmin.pro
   pcbsd/trunk/NetworkTray/NetworkTray.pro
   pcbsd/trunk/PBIThumbnailCreator/CMakeLists.txt
   pcbsd/trunk/PBIdelete/PBIdelete.pro
   pcbsd/trunk/PBReg/PBReg.pro
   pcbsd/trunk/ServiceManager/servicemanager.pro
   pcbsd/trunk/SoundError/SoundError.pro
   pcbsd/trunk/SystemUpdater/SystemUpdater.pro
   pcbsd/trunk/XGUISource/XGUI.pro
   pcbsd/trunk/ethernetconfig/ethernetconfig.pro
   pcbsd/trunk/kcmPBMsource/PBM.pro
   pcbsd/trunk/kcmPBSystem/PBSystem.pro
   pcbsd/trunk/kcmPBUstart/PBUstart.pro
   pcbsd/trunk/kcmPFManager/pfmanager.pro
   pcbsd/trunk/libpcbsd/CMakeLists.txt
   pcbsd/trunk/pcbsdusermanager/pcbsdusermanager.pro
   pcbsd/trunk/wificonfig/wificonfig.pro
Log:


Updated our various PC-BSD GUI's and tools to use the /PCBSD/local LOCALBASE instead of /usr/local



Modified: pcbsd/trunk/CrashHandler/CrashHandler.pro
===================================================================
--- pcbsd/trunk/CrashHandler/CrashHandler.pro	2008-12-12 16:14:54 UTC (rev 3065)
+++ pcbsd/trunk/CrashHandler/CrashHandler.pro	2008-12-12 16:32:44 UTC (rev 3066)
@@ -21,8 +21,8 @@
 
 TRANSLATIONS = CrashHandler_en.ts
 
-INCLUDEPATH     += /PCBSD/includes /usr/local/kde4/include
+INCLUDEPATH     += /PCBSD/includes /PCBSD/local/kde4/include
 
-QMAKE_LIBDIR = /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib
+QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib
 
 QT +=qt3support

Modified: pcbsd/trunk/NetworkManager/NetworkManager.pro
===================================================================
--- pcbsd/trunk/NetworkManager/NetworkManager.pro	2008-12-12 16:14:54 UTC (rev 3065)
+++ pcbsd/trunk/NetworkManager/NetworkManager.pro	2008-12-12 16:32:44 UTC (rev 3066)
@@ -3,9 +3,9 @@
 
 CONFIG	+= qt warn_on debug release
 
-INCLUDEPATH	+= /PCBSD/includes /usr/local/kde4/include
+INCLUDEPATH	+= /PCBSD/includes /PCBSD/local/kde4/include
 
-LIBS += -L/usr/local/kde4/lib -L/usr/local/lib/ -lpcbsd -lkdecore -lkio -lkdeui -Ikdelibs
+LIBS += -L/PCBSD/local/kde4/lib -L/PCBSD/local/lib/ -lpcbsd -lkdecore -lkio -lkdeui -Ikdelibs
 
 HEADERS	+= kcm.h restartpopup.h networkman.h
 
@@ -17,10 +17,10 @@
 
 TARGET  = kcm_pcbsdnetwork
 
-DESTDIR = /usr/local/kde4/lib/kde4/
+DESTDIR = /PCBSD/local/kde4/lib/kde4/
 
 TRANSLATIONS = NetworkManager_en.ts
 
-QMAKE_LIBDIR = /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib
+QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib
 
 QT += qt3support

Modified: pcbsd/trunk/NetworkManagerAdmin/NetworkManagerAdmin.pro
===================================================================
--- pcbsd/trunk/NetworkManagerAdmin/NetworkManagerAdmin.pro	2008-12-12 16:14:54 UTC (rev 3065)
+++ pcbsd/trunk/NetworkManagerAdmin/NetworkManagerAdmin.pro	2008-12-12 16:32:44 UTC (rev 3066)
@@ -3,9 +3,9 @@
 
 CONFIG	+= qt warn_on debug release
 
-INCLUDEPATH	+= /PCBSD/includes /usr/local/kde4/include
+INCLUDEPATH	+= /PCBSD/includes /PCBSD/local/kde4/include
 
-LIBS += -L/usr/local/kde4/lib -L/usr/local/lib/ -lpcbsd -lkdecore -lkio -lkdeui -Ikdelibs
+LIBS += -L/PCBSD/local/kde4/lib -L/PCBSD/local/lib/ -lpcbsd -lkdecore -lkio -lkdeui -Ikdelibs
 
 HEADERS	+= netmanadmin.h
 
@@ -21,4 +21,4 @@
 
 TRANSLATIONS = NetworkManagerAdmin_en.ts
 
-QMAKE_LIBDIR = /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib
+QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib

Modified: pcbsd/trunk/NetworkTray/NetworkTray.pro
===================================================================
--- pcbsd/trunk/NetworkTray/NetworkTray.pro	2008-12-12 16:14:54 UTC (rev 3065)
+++ pcbsd/trunk/NetworkTray/NetworkTray.pro	2008-12-12 16:32:44 UTC (rev 3066)
@@ -5,16 +5,16 @@
 TARGET  = NetworkTray
 DESTDIR = /PCBSD/networkmanager/bin/
 
-INCLUDEPATH += /usr/local/kde4/include
+INCLUDEPATH += /PCBSD/local/kde4/include
 
-LIBS += -L/usr/local/kde4/lib -lkdecore -lkio -lkdeui -Ikdelibs
+LIBS += -L/PCBSD/local/kde4/lib -lkdecore -lkio -lkdeui -Ikdelibs
 
 HEADERS	+= NetworkTray.h
 
 SOURCES	+= main.cpp \
 	NetworkTray.cpp
 
-QMAKE_LIBDIR = /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib
+QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib
 
 QT += qt3support
 

Modified: pcbsd/trunk/PBIThumbnailCreator/CMakeLists.txt
===================================================================
--- pcbsd/trunk/PBIThumbnailCreator/CMakeLists.txt	2008-12-12 16:14:54 UTC (rev 3065)
+++ pcbsd/trunk/PBIThumbnailCreator/CMakeLists.txt	2008-12-12 16:32:44 UTC (rev 3066)
@@ -1,10 +1,10 @@
 PROJECT (PBI_ThumbnailCreator)
-set(CMAKE_PREFIX_PATH /usr/local/kde4)
+set(CMAKE_PREFIX_PATH /PCBSD/local/kde4)
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
 cmake_minimum_required(VERSION 2.4.0)
 
 
-set(CMAKE_INSTALL_PREFIX:PATH "/usr/local/kde4")
+set(CMAKE_INSTALL_PREFIX:PATH "/PCBSD/local/kde4")
 find_package(Qt4 REQUIRED)
 find_package(KDE4 REQUIRED)
 include(FindAutomoc4)
@@ -18,7 +18,7 @@
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  ${KDE4_ENABLE_EXCEPTIONS}")
 
 link_directories(${KDE4_LIB_DIR})
-include_directories(${KDE4_INCLUDE_DIR} ${QT_INCLUDE_DIR} /usr/local/include ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${KDE4_INCLUDE_DIR} ${QT_INCLUDE_DIR} /PCBSD/local/include ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
 set (pbithumbnail_SRCS
  pbicreator.cpp
@@ -33,4 +33,4 @@
 ### INSTALL ###
 
 INSTALL_TARGETS(/kde4/lib/kde4 pbithumbnail)
-install(FILES pbithumbnail.desktop DESTINATION /usr/local/kde4/share/kde4/services)
+install(FILES pbithumbnail.desktop DESTINATION /PCBSD/local/kde4/share/kde4/services)

Modified: pcbsd/trunk/PBIdelete/PBIdelete.pro
===================================================================
--- pcbsd/trunk/PBIdelete/PBIdelete.pro	2008-12-12 16:14:54 UTC (rev 3065)
+++ pcbsd/trunk/PBIdelete/PBIdelete.pro	2008-12-12 16:32:44 UTC (rev 3066)
@@ -12,7 +12,7 @@
 
 QT +=qt3support
 
-INCLUDEPATH     += /PCBSD/includes /usr/local/kde4/include
+INCLUDEPATH     += /PCBSD/includes /PCBSD/local/kde4/include
 
-QMAKE_LIBDIR = /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib
+QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib
 

Modified: pcbsd/trunk/PBReg/PBReg.pro
===================================================================
--- pcbsd/trunk/PBReg/PBReg.pro	2008-12-12 16:14:54 UTC (rev 3065)
+++ pcbsd/trunk/PBReg/PBReg.pro	2008-12-12 16:32:44 UTC (rev 3066)
@@ -11,7 +11,7 @@
 
 QT +=qt3support
 
-INCLUDEPATH     += /PCBSD/includes /usr/local/kde4/include
+INCLUDEPATH     += /PCBSD/includes /PCBSD/local/kde4/include
 
-QMAKE_LIBDIR = /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib
+QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib
 

Modified: pcbsd/trunk/ServiceManager/servicemanager.pro
===================================================================
--- pcbsd/trunk/ServiceManager/servicemanager.pro	2008-12-12 16:14:54 UTC (rev 3065)
+++ pcbsd/trunk/ServiceManager/servicemanager.pro	2008-12-12 16:32:44 UTC (rev 3066)
@@ -3,14 +3,14 @@
 
 CONFIG	+= qt warn_on release
 
-INCLUDEPATH += /usr/local/kde4/include
+INCLUDEPATH += /PCBSD/local/kde4/include
 
-LIBS += -L/usr/local/kde4/lib -lkdecore -lkio -lkdeui -Ikdelibs
+LIBS += -L/PCBSD/local/kde4/lib -lkdecore -lkio -lkdeui -Ikdelibs
 
 
 TARGET  = kcm_pcbsdservices
 
-DESTDIR = /usr/local/kde4/lib/kde4/
+DESTDIR = /PCBSD/local/kde4/lib/kde4/
 
 
 HEADERS	+= kcm.h notroot.h servicemanager.h
@@ -24,4 +24,4 @@
 
 QT += qt3support
 
-QMAKE_LIBDIR = /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib
+QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib

Modified: pcbsd/trunk/SoundError/SoundError.pro
===================================================================
--- pcbsd/trunk/SoundError/SoundError.pro	2008-12-12 16:14:54 UTC (rev 3065)
+++ pcbsd/trunk/SoundError/SoundError.pro	2008-12-12 16:32:44 UTC (rev 3066)
@@ -1,7 +1,7 @@
 TEMPLATE	= app
 LANGUAGE	= C++
 
-LIBS	+= -L/usr/local/kde4/lib -lkdeui -lkdecore -lkio
+LIBS	+= -L/PCBSD/local/kde4/lib -lkdeui -lkdecore -lkio
 
 CONFIG	+= qt warn_on release
 
@@ -19,7 +19,7 @@
 
 TRANSLATIONS = SoundError_en.ts
 
-INCLUDEPATH     += /PCBSD/includes /usr/local/kde4/include
+INCLUDEPATH     += /PCBSD/includes /PCBSD/local/kde4/include
 
-QMAKE_LIBDIR = /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib
+QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib
 

Modified: pcbsd/trunk/SystemUpdater/SystemUpdater.pro
===================================================================
--- pcbsd/trunk/SystemUpdater/SystemUpdater.pro	2008-12-12 16:14:54 UTC (rev 3065)
+++ pcbsd/trunk/SystemUpdater/SystemUpdater.pro	2008-12-12 16:32:44 UTC (rev 3066)
@@ -14,11 +14,11 @@
 
 RESOURCES += SystemUpdater.qrc
 
-INCLUDEPATH += /usr/local/kde4/include
+INCLUDEPATH += /PCBSD/local/kde4/include
 
-LIBS += -L/usr/local/kde4/lib
+LIBS += -L/PCBSD/local/kde4/lib
 
-QMAKE_LIBDIR = /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib
+QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib
 
 TARGET  = SystemUpdater
 DESTDIR = /PCBSD/SystemUpdater/bin/

Modified: pcbsd/trunk/XGUISource/XGUI.pro
===================================================================
--- pcbsd/trunk/XGUISource/XGUI.pro	2008-12-12 16:14:54 UTC (rev 3065)
+++ pcbsd/trunk/XGUISource/XGUI.pro	2008-12-12 16:32:44 UTC (rev 3066)
@@ -5,9 +5,9 @@
 
 TRANSLATIONS = xgui_en.ts
 
-LIBS += -L/usr/local/kde4/lib -L/usr/local/lib/qt4 -lkdecore -lkio -lkdeui -Ikdelibs
+LIBS += -L/PCBSD/local/kde4/lib -L/PCBSD/local/lib/qt4 -lkdecore -lkio -lkdeui -Ikdelibs
 
-QMAKE_LIBDIR = /usr/local/kde4/lib /usr/local/lib/qt4
+QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4
 
 SOURCES	+= main.cpp xgui.cpp dialogconfirm.cpp
 
@@ -18,7 +18,7 @@
 
 RESOURCES += XGUI.qrc
 
-INCLUDEPATH += /usr/local/kde4/include
+INCLUDEPATH += /PCBSD/local/kde4/include
 
 
 TARGET  = XGUI

Modified: pcbsd/trunk/ethernetconfig/ethernetconfig.pro
===================================================================
--- pcbsd/trunk/ethernetconfig/ethernetconfig.pro	2008-12-12 16:14:54 UTC (rev 3065)
+++ pcbsd/trunk/ethernetconfig/ethernetconfig.pro	2008-12-12 16:32:44 UTC (rev 3066)
@@ -3,7 +3,7 @@
 
 CONFIG	+= qt warn_on release
 
-LIBS	+= -L/usr/local/kde4/lib -lkdeui -lkdecore -lkio -lpcbsd
+LIBS	+= -L/PCBSD/local/kde4/lib -lkdeui -lkdecore -lkio -lpcbsd
 
 HEADERS += ethernetconfig.h 
 
@@ -22,7 +22,7 @@
 
 QT += qt3support
 
-INCLUDEPATH     += /PCBSD/includes /usr/local/kde4/include
+INCLUDEPATH     += /PCBSD/includes /PCBSD/local/kde4/include
 
-QMAKE_LIBDIR = /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib
+QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib
 

Modified: pcbsd/trunk/kcmPBMsource/PBM.pro
===================================================================
--- pcbsd/trunk/kcmPBMsource/PBM.pro	2008-12-12 16:14:54 UTC (rev 3065)
+++ pcbsd/trunk/kcmPBMsource/PBM.pro	2008-12-12 16:32:44 UTC (rev 3066)
@@ -3,7 +3,7 @@
 
 CONFIG	+= qt warn_on release
 
-LIBS += -L/usr/local/kde4/lib -lkdecore -lkio -lkdeui -Ikdelibs
+LIBS += -L/PCBSD/local/kde4/lib -lkdecore -lkio -lkdeui -Ikdelibs
 
 HEADERS	+= kcm.h notroot.h pbm.h
 
@@ -19,13 +19,13 @@
 
 TARGET  = kcm_pcbsdpbm
 
-DESTDIR = /usr/local/kde4/lib/kde4
+DESTDIR = /PCBSD/local/kde4/lib/kde4
 
 TRANSLATIONS = PBM_en_US.ts 
 
 QT +=  qt3support 
 
-INCLUDEPATH     += /PCBSD/includes /usr/local/kde4/include
+INCLUDEPATH     += /PCBSD/includes /PCBSD/local/kde4/include
 
-QMAKE_LIBDIR = /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib
+QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib
 

Modified: pcbsd/trunk/kcmPBSystem/PBSystem.pro
===================================================================
--- pcbsd/trunk/kcmPBSystem/PBSystem.pro	2008-12-12 16:14:54 UTC (rev 3065)
+++ pcbsd/trunk/kcmPBSystem/PBSystem.pro	2008-12-12 16:32:44 UTC (rev 3066)
@@ -3,9 +3,9 @@
 
 CONFIG	+= qt warn_on release
 
-LIBS	+= -Ikdelibs -L/usr/local/kde4/lib -lkdecore -lkio -lkdeui -lpcbsd
+LIBS	+= -Ikdelibs -L/PCBSD/local/kde4/lib -lkdecore -lkio -lkdeui -lpcbsd
 
-INCLUDEPATH	+= /PCBSD/includes /usr/local/kde4/include
+INCLUDEPATH	+= /PCBSD/includes /PCBSD/local/kde4/include
 
 HEADERS	+= kcm.h notroot.h cvsupprogress.h fastestcvsup.h pbsystemtab.h portsnapprogress.h
 
@@ -21,10 +21,10 @@
 
 TARGET  = kcm_pcbsdsystem
 
-DESTDIR = /usr/local/kde4/lib/kde4/
+DESTDIR = /PCBSD/local/kde4/lib/kde4/
 
 TRANSLATIONS = PBSystem_en.ts PBSystem_af.ts PBSystem_ar.ts PBSystem_az.ts PBSystem_bg.ts PBSystem_bn.ts PBSystem_bs.ts PBSystem_ca.ts PBSystem_cs.ts PBSystem_cy.ts PBSystem_da.ts PBSystem_de.ts PBSystem_el.ts PBSystem_es.ts PBSystem_et.ts PBSystem_eu.ts PBSystem_fa.ts PBSystem_fi.ts PBSystem_fr.ts PBSystem_gl.ts PBSystem_he.ts PBSystem_hi.ts PBSystem_hr.ts PBSystem_hu.ts PBSystem_id.ts PBSystem_is.ts PBSystem_it.ts PBSystem_ja.ts PBSystem_ka.ts PBSystem_ko.ts PBSystem_lt.ts PBSystem_lv.ts PBSystem_mk.ts PBSystem_mn.ts PBSystem_ms.ts PBSystem_mt.ts PBSystem_nb.ts PBSystem_nl.ts PBSystem_pa.ts PBSystem_pl.ts PBSystem_pt.ts PBSystem_pt_BR.ts PBSystem_ro.ts PBSystem_ru.ts PBSystem_sk.ts PBSystem_sl.ts PBSystem_sr.ts PBSystem_sv.ts PBSystem_ta.ts PBSystem_tg.ts PBSystem_th.ts PBSystem_tr.ts PBSystem_uk.ts PBSystem_uz.ts PBSystem_vi.ts PBSystem_zh_CN.ts PBSystem_zh_HK.ts PBSystem_zh_TW.ts PBSystem_zu.ts
 
-QMAKE_LIBDIR = /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib
+QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib
 
 QT += qt3support

Modified: pcbsd/trunk/kcmPBUstart/PBUstart.pro
===================================================================
--- pcbsd/trunk/kcmPBUstart/PBUstart.pro	2008-12-12 16:14:54 UTC (rev 3065)
+++ pcbsd/trunk/kcmPBUstart/PBUstart.pro	2008-12-12 16:32:44 UTC (rev 3066)
@@ -3,9 +3,9 @@
 
 CONFIG	+= qt warn_on release
 
-LIBS	+= -Ikdelibs -L/usr/local/kde4/lib -lkdecore -lkio -lkdeui
+LIBS	+= -Ikdelibs -L/PCBSD/local/kde4/lib -lkdecore -lkio -lkdeui
 
-INCLUDEPATH	+= /PCBSD/includes /usr/local/kde4/include
+INCLUDEPATH	+= /PCBSD/includes /PCBSD/local/kde4/include
 
 HEADERS	+= kcm.h notroot.h 
 
@@ -17,13 +17,13 @@
 
 TARGET  = kcm_pbustart
 
-DESTDIR = /usr/local/kde4/lib/kde4/
+DESTDIR = /PCBSD/local/kde4/lib/kde4/
 
 TRANSLATIONS = PBUstart.ts
 
-QMAKE_LIBDIR = /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib
+QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib
 
-desktop.path=/usr/local/kde4/share/kde4/services/
+desktop.path=/PCBSD/local/kde4/share/kde4/services/
 desktop.files=pcbsdpbu.desktop
 
 QT += qt3support

Modified: pcbsd/trunk/kcmPFManager/pfmanager.pro
===================================================================
--- pcbsd/trunk/kcmPFManager/pfmanager.pro	2008-12-12 16:14:54 UTC (rev 3065)
+++ pcbsd/trunk/kcmPFManager/pfmanager.pro	2008-12-12 16:32:44 UTC (rev 3066)
@@ -5,9 +5,9 @@
 
 INCLUDEPATH	+= . config
 
-INCLUDEPATH += /usr/local/kde4/include
+INCLUDEPATH += /PCBSD/local/kde4/include
 
-LIBS += -L/usr/local/kde4/lib -lkdecore -lkio -lkdeui -Ikdelibs
+LIBS += -L/PCBSD/local/kde4/lib -lkdecore -lkio -lkdeui -Ikdelibs
 
 
 HEADERS	+= kcm.hpp \
@@ -39,25 +39,25 @@
 RESOURCES += pfmanager.qrc
 
 
-TARGET = /usr/local/kde4/lib/kde4/kcm_pfmanager
+TARGET = /PCBSD/local/kde4/lib/kde4/kcm_pfmanager
 DEPENDPATH += config
 
 TRANSLATIONS = PFManager_en.ts \
                PFManager_de.ts
 
-desktop.path=/usr/local/kde4/share/applications/kde4/
+desktop.path=/PCBSD/local/kde4/share/applications/kde4/
 desktop.files=kcm_pfmanager.desktop
 
-kcm.path=/usr/local/kde4/lib/kde4/
+kcm.path=/PCBSD/local/kde4/lib/kde4/
 kcm.files=kcm_pfmanager.la
-kcm.extra=cp -f libkcm_pfmanager.so.1.0.0 /usr/local/kde4/lib/kde4/kcm_pfmanager.so
+kcm.extra=cp -f libkcm_pfmanager.so.1.0.0 /PCBSD/local/kde4/lib/kde4/kcm_pfmanager.so
 
 lang.path=/PCBSD/LANGS/
 lang.files=PFManager_en.ts PFManager_de.ts
 
 INSTALLS += lang desktop kcm
 
-QMAKE_LIBDIR = /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib
+QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib
 
 
 QT += qt3support

Modified: pcbsd/trunk/libpcbsd/CMakeLists.txt
===================================================================
--- pcbsd/trunk/libpcbsd/CMakeLists.txt	2008-12-12 16:14:54 UTC (rev 3065)
+++ pcbsd/trunk/libpcbsd/CMakeLists.txt	2008-12-12 16:32:44 UTC (rev 3066)
@@ -20,5 +20,5 @@
 
 ### INSTALL ###
 
-INSTALL_TARGETS(/../../usr/local/lib pcbsd)
+INSTALL_TARGETS(/../../PCBSD/local/lib pcbsd)
 INSTALL_FILES(/../../PCBSD/includes "([A-Z]|[a-z]|[0-9])+\\.h$")

Modified: pcbsd/trunk/pcbsdusermanager/pcbsdusermanager.pro
===================================================================
--- pcbsd/trunk/pcbsdusermanager/pcbsdusermanager.pro	2008-12-12 16:14:54 UTC (rev 3065)
+++ pcbsd/trunk/pcbsdusermanager/pcbsdusermanager.pro	2008-12-12 16:32:44 UTC (rev 3066)
@@ -4,7 +4,7 @@
 CONFIG  += dll
 
 
-LIBS += -L/usr/local/kde4/lib -lkdecore -lkio -lkdeui -Ikdelibs -lcrypt
+LIBS += -L/PCBSD/local/kde4/lib -lkdecore -lkio -lkdeui -Ikdelibs -lcrypt
 
 SOURCES += notroot.cpp \
 	group.cpp \
@@ -37,21 +37,21 @@
 
 RESOURCES += pcbsdusermanager.qrc
 
-INCLUDEPATH += /usr/local/kde4/include /usr/local/include/qt4
+INCLUDEPATH += /PCBSD/local/kde4/include /PCBSD/local/include/qt4
 
-TARGET = /usr/local/kde4/lib/kde4/kcm_pcbsdusermanager
+TARGET = /PCBSD/local/kde4/lib/kde4/kcm_pcbsdusermanager
 
 TRANSLATIONS = pcbsdusermanager_en.ts
 
-desktop.path=/usr/local/kde4/share/applications/kde4/
+desktop.path=/PCBSD/local/kde4/share/applications/kde4/
 desktop.files=kcm_pcbsdusermanager.desktop
 
-kcm.path=/usr/local/kde4/lib/kde4/
+kcm.path=/PCBSD/local/kde4/lib/kde4/
 kcm.files=kcm_pcbsdusermanager.la
-kcm.extra=cp -f libkcm_pcbsdusermanager.so.1.0.0 /usr/local/kde4/lib/kde4/kcm_pcbsdusermanager.so
+kcm.extra=cp -f libkcm_pcbsdusermanager.so.1.0.0 /PCBSD/local/kde4/lib/kde4/kcm_pcbsdusermanager.so
 
 INSTALLS += desktop kcm
 
-QMAKE_LIBDIR = /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib
+QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib
 
 QT += qt3support

Modified: pcbsd/trunk/wificonfig/wificonfig.pro
===================================================================
--- pcbsd/trunk/wificonfig/wificonfig.pro	2008-12-12 16:14:54 UTC (rev 3065)
+++ pcbsd/trunk/wificonfig/wificonfig.pro	2008-12-12 16:32:44 UTC (rev 3066)
@@ -3,9 +3,9 @@
 
 CONFIG	+= qt warn_on release
 
-LIBS	+= -L/usr/local/kde4/lib -lkdeui -lkdecore -lkio -lpcbsd
+LIBS	+= -L/PCBSD/local/kde4/lib -lkdeui -lkdecore -lkio -lpcbsd
 
-INCLUDEPATH	+= /PCBSD/includes /usr/local/kde4/include
+INCLUDEPATH	+= /PCBSD/includes /PCBSD/local/kde4/include
 
 HEADERS += dialogwpaenterprise.h \
 	   dialogwpapersonal.h \
@@ -35,7 +35,7 @@
 
 TARGET  = wificonfig
 
-QMAKE_LIBDIR	= /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib
+QMAKE_LIBDIR	= /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib
 
 DESTDIR = /PCBSD/networkmanager/bin/
 



More information about the Commits mailing list