[Kst] branches/work/kst/portto4/kst/src

[George Staikos]

SVN commit 695695 by staikos:

OS X build fixes


 M  +2 -1      kst/kst.pro  
 M  +2 -4      libkst/libkst.pro  


--- branches/work/kst/portto4/kst/src/kst/kst.pro #695694:695695
@@ -22,4 +22,5 @@
 QMAKE_RPATHDIR += $$OUTPUT_DIR/lib $$OUTPUT_DIR/plugin
 
 RESOURCES += \
-    ../images/images.qrc
+    $$TOPLEVELDIR/src/images/images.qrc
+
--- branches/work/kst/portto4/kst/src/libkst/libkst.pro #695694:695695
@@ -12,6 +12,7 @@
     tmp \
     $$OUTPUT_DIR/src/libkst/tmp
 
+x11:!macx:PROCPS += sysinfo.c psversion.c
 SOURCES += \
     kstobject.cpp \
     kstdatasource.cpp \
@@ -26,10 +27,7 @@
     #ksttimezones.cpp \
     kstscalar.cpp \
     # $(PROCPS_COPY) \
-    # FIXME: switch to a variable
-    sysinfo.c \
-    psversion.c \
-    # END FIXME
+    $$PROCPS \
     kststring.cpp \
     kstmatrix.cpp \
     kstrmatrix.cpp \