gammu: fix staging, add NOTE for improvement

diff --git a/packages/gammu/gammu_1.06.00.bb b/packages/gammu/gammu_1.06.00.bb
index cbfe1b0..2611050 100644 (file)
--- a/packages/gammu/gammu_1.06.00.bb
+++ b/packages/gammu/gammu_1.06.00.bb
@@ -17,46 +17,34 @@ do_compile () {
         oe_runmake shared
 }
 
+# FIXME instead of ripping the complete autotools_stage_all, just because
+# FIXME gammu needs an additional install target (installshared), it might
+# FIXME be more appropriate to a) make the install target in autotools_stage_all
+# FIXME customizable or b) alter gammu makefall to make 'install' depend on 'installshared'. :M:
 do_stage() {
-        install -d ${STAGING_INCDIR}/gammu/misc  ${STAGING_INCDIR}/gammu/misc/coding \
-                   ${STAGING_INCDIR}/gammu/phone ${STAGING_INCDIR}/gammu/phone/at \
-                   ${STAGING_INCDIR}/gammu/phone/obex ${STAGING_INCDIR}/gammu/phone/nokia \
-                   ${STAGING_INCDIR}/gammu/phone/nokia/dct3 ${STAGING_INCDIR}/gammu/phone/nokia/dct4tiku \
-                   ${STAGING_INCDIR}/gammu/phone/symbian ${STAGING_INCDIR}/gammu/phone/alcatel \
-                   ${STAGING_INCDIR}/gammu/service ${STAGING_INCDIR}/gammu/service/sms \
-                   ${STAGING_INCDIR}/gammu/service/backup ${STAGING_INCDIR}/gammu/device \
-                   ${STAGING_INCDIR}/gammu/device/irda ${STAGING_INCDIR}/gammu/device/bluetoth \
-                   ${STAGING_INCDIR}/gammu/device/serial ${STAGING_INCDIR}/gammu/protocol \
-                   ${STAGING_INCDIR}/gammu/protocol/at ${STAGING_INCDIR}/gammu/protocol/obex \
-                   ${STAGING_INCDIR}/gammu/protocol/nokia ${STAGING_INCDIR}/gammu/protocol/symbian \
-                   ${STAGING_INCDIR}/gammu/protocol/alcatel
-
-        oe_libinstall -so -C common libGammu ${STAGING_LIBDIR}
-
-        install -m 0644 common/*.h                      ${STAGING_INCDIR}/gammu/
-        install -m 0644 common/misc/*.h                 ${STAGING_INCDIR}/gammu/misc 
-        install -m 0644 common/misc/coding/*.h          ${STAGING_INCDIR}/gammu/misc/coding 
-        install -m 0644 common/phone/*.h                ${STAGING_INCDIR}/gammu/phone 
-        install -m 0644 common/phone/at/*.h             ${STAGING_INCDIR}/gammu/phone/at 
-        install -m 0644 common/phone/obex/*.h           ${STAGING_INCDIR}/gammu/phone/obex 
-        install -m 0644 common/phone/nokia/*.h          ${STAGING_INCDIR}/gammu/phone/nokia 
-        install -m 0644 common/phone/nokia/dct3/*.h     ${STAGING_INCDIR}/gammu/phone/nokia/dct3 
-        install -m 0644 common/phone/nokia/dct4tiku/*.h     ${STAGING_INCDIR}/gammu/phone/nokia/dct4tiku
-        install -m 0644 common/phone/symbian/*.h        ${STAGING_INCDIR}/gammu/phone/symbian 
-        install -m 0644 common/phone/alcatel/*.h        ${STAGING_INCDIR}/gammu/phone/alcatel 
-        install -m 0644 common/service/*.h              ${STAGING_INCDIR}/gammu/service 
-        install -m 0644 common/service/sms/*.h          ${STAGING_INCDIR}/gammu/service/sms 
-        install -m 0644 common/service/backup/*.h       ${STAGING_INCDIR}/gammu/service/backup 
-        install -m 0644 common/device/*.h               ${STAGING_INCDIR}/gammu/device 
-        install -m 0644 common/device/irda/*.h          ${STAGING_INCDIR}/gammu/device/irda 
-        install -m 0644 common/device/bluetoth/*.h      ${STAGING_INCDIR}/gammu/device/bluetoth 
-        install -m 0644 common/device/serial/*.h        ${STAGING_INCDIR}/gammu/device/serial 
-        install -m 0644 common/protocol/*.h             ${STAGING_INCDIR}/gammu/protocol 
-        install -m 0644 common/protocol/at/*.h          ${STAGING_INCDIR}/gammu/protocol/at 
-        install -m 0644 common/protocol/obex/*.h        ${STAGING_INCDIR}/gammu/protocol/obex 
-        install -m 0644 common/protocol/nokia/*.h       ${STAGING_INCDIR}/gammu/protocol/nokia 
-        install -m 0644 common/protocol/symbian/*.h     ${STAGING_INCDIR}/gammu/protocol/symbian 
-        install -m 0644 common/protocol/alcatel/*.h     ${STAGING_INCDIR}/gammu/protocol/alcatel
+        rm -rf ${STAGE_TEMP}
+        mkdir -p ${STAGE_TEMP}
+        oe_runmake DESTDIR="${STAGE_TEMP}" install
+       oe_runmake DESTDIR="${STAGE_TEMP}" installshared
+        if [ -d ${STAGE_TEMP}/${includedir} ]; then
+                cp -fpPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}
+        fi
+        if [ -d ${STAGE_TEMP}/${libdir} ]
+        then
+                for i in ${STAGE_TEMP}/${libdir}/*.la
+                do
+                        if [ ! -f "$i" ]; then
+                                cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}
+                                break
+                        fi
+                        oe_libinstall -so $(basename $i .la) ${STAGING_LIBDIR}
+                done
+        fi
+        if [ -d ${STAGE_TEMP}/${datadir}/aclocal ]; then
+                install -d ${STAGING_DATADIR}/aclocal
+                cp -fpPR ${STAGE_TEMP}/${datadir}/aclocal/* ${STAGING_DATADIR}/aclocal
+        fi
+        rm -rf ${STAGE_TEMP}
 }
 
 do_install () {