summaryrefslogtreecommitdiff
path: root/gnome
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-05-10 08:38:15 +0000
committerChris Larson <clarson@kergoth.com>2004-05-10 08:38:15 +0000
commit9aa6d7445a4650331fa820f971f9140c1d785aeb (patch)
treeb074f8260d387937967675950038dd95d9d7d752 /gnome
parent9fcbda0bf62f0f1bf5259e0ac04bf051a9246402 (diff)
Fixup some more usage of the oe_libinstall script.
BKrev: 409f3f772sSA3_XlhzxSt0billeAFw
Diffstat (limited to 'gnome')
-rw-r--r--gnome/gconf_2.6.1.oe3
-rw-r--r--gnome/orbit2_2.10.2.oe12
2 files changed, 5 insertions, 10 deletions
diff --git a/gnome/gconf_2.6.1.oe b/gnome/gconf_2.6.1.oe
index 7eed5a6bc4..04f906d401 100644
--- a/gnome/gconf_2.6.1.oe
+++ b/gnome/gconf_2.6.1.oe
@@ -12,8 +12,7 @@ inherit autotools pkgconfig
HEADERS = "gconf.h gconf-changeset.h gconf-listeners.h gconf-schema.h gconf-value.h gconf-error.h gconf-engine.h gconf-client.h gconf-enum-types.h"
do_stage() {
- oe_soinstall gconf/.libs/libgconf-2.so.4.1.0 ${STAGING_LIBDIR}/
- install -m 0644 gconf/.libs/libgconf-2.lai ${STAGING_LIBDIR}/libgconf-2.la
+ oe_libinstall -so -C gconf libgconf-2 ${STAGING_LIBDIR}
install -d ${STAGING_INCDIR}/gconf/2/gconf/
( cd gconf; for i in ${HEADERS}; do install -m 0644 $i ${STAGING_INCDIR}/gconf/2/gconf/$i; done )
}
diff --git a/gnome/orbit2_2.10.2.oe b/gnome/orbit2_2.10.2.oe
index 6c90630ab3..d538807569 100644
--- a/gnome/orbit2_2.10.2.oe
+++ b/gnome/orbit2_2.10.2.oe
@@ -19,12 +19,10 @@ do_configure_prepend() {
}
do_stage() {
- oe_soinstall src/orb/.libs/libORBit-2.so.0.0.0 ${STAGING_LIBDIR}
- install -m 0644 src/orb/.libs/libORBit-2.lai ${STAGING_LIBDIR}/libORBit-2.la
- oe_soinstall src/services/name/.libs/libORBitCosNaming-2.so.0.0.0 ${STAGING_LIBDIR}
- install -m 0644 src/services/name/.libs/libORBitCosNaming-2.lai ${STAGING_LIBDIR}/libORBitCosNaming-2.la
- oe_soinstall src/services/imodule/.libs/libORBit-imodule-2.so.0.0.0 ${STAGING_LIBDIR}
- install -m 0644 src/services/imodule/.libs/libORBit-imodule-2.lai ${STAGING_LIBDIR}/libORBit-imodule-2.la
+ oe_libinstall -so -C src/orb libORBit-2 ${STAGING_LIBDIR}
+ oe_libinstall -so -C src/services/name libORBitCosNaming-2 ${STAGING_LIBDIR}
+ oe_libinstall -a -C src/services/name libname-server-2 ${STAGING_LIBDIR}
+ oe_libinstall -so -C src/services/imodule libORBit-imodule-2 ${STAGING_LIBDIR}
for dir in orbit orbit/poa orbit/orb-core orbit/util orbit/dynamic; do
install -d ${STAGING_INCDIR}/orbit-2.0/$dir
@@ -35,6 +33,4 @@ do_stage() {
install -m 0644 src/services/name/CosNaming.h ${STAGING_INCDIR}/orbit-2.0/ORBitservices/
install -m 0644 src/services/name/CosNaming_impl.h ${STAGING_INCDIR}/orbit-2.0/ORBitservices/
install -m 0644 src/services/imodule/orbit-imodule.h ${STAGING_INCDIR}/orbit-2.0/ORBitservices/
-
- install -m 0644 src/services/name/libname-server-2.a ${STAGING_LIBDIR}/
}