merge of 59a26e4bc6be5d4a3bf6f7604ed3be4c535d7ced

     and eecdb83ac8464beff7f6584c6e739f30ba91e43d

62 files changed, 62 insertions, 293 deletions

diff --git a/packages/cairo/cairo_1.0.0.bb b/packages/cairo/cairo_1.0.0.bb
index aa97a9f4de..84cb581174 100644
--- a/packages/cairo/cairo_1.0.0.bb
+++ b/packages/cairo/cairo_1.0.0.bb
@@ -11,5 +11,5 @@ SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
 inherit autotools pkgconfig 
 
 do_stage () {
-	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+	autotools_stage_all
 }
diff --git a/packages/cairo/libsvg-cairo_20050601.bb b/packages/cairo/libsvg-cairo_20050601.bb
index eddc886571..2a49ec52ba 100644
--- a/packages/cairo/libsvg-cairo_20050601.bb
+++ b/packages/cairo/libsvg-cairo_20050601.bb
@@ -14,5 +14,5 @@ S = "${WORKDIR}/libsvg-cairo"
 inherit autotools pkgconfig 
 
 do_stage () {
-	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+	autotools_stage_all
 }
diff --git a/packages/cairo/libsvg-cairo_cvs.bb b/packages/cairo/libsvg-cairo_cvs.bb
index 4cbebadc56..a90447a1df 100644
--- a/packages/cairo/libsvg-cairo_cvs.bb
+++ b/packages/cairo/libsvg-cairo_cvs.bb
@@ -2,7 +2,6 @@ PV = "0.0+cvs${SRCDATE}"
 SECTION = "libs"
 LICENSE = "LGPL"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@debian.org>"
 DEPENDS = "libsvg cairo"
 DESCRIPTION = "SVG rendering library"
 DEFAULT_PREFERENCE = "-1"
@@ -12,5 +11,5 @@ S = "${WORKDIR}/libsvg-cairo"
 inherit autotools pkgconfig 
 
 do_stage () {
-	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+	autotools_stage_all
 }
diff --git a/packages/cairo/libsvg_cvs.bb b/packages/cairo/libsvg_cvs.bb
index 9ce7d7af08..f2bae3e016 100644
--- a/packages/cairo/libsvg_cvs.bb
+++ b/packages/cairo/libsvg_cvs.bb
@@ -14,5 +14,5 @@ EXTRA_OECONF = "--with-expat"
 inherit autotools pkgconfig 
 
 do_stage () {
-	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+	autotools_stage_all
 }
diff --git a/packages/ice/ice_6.3.3.bb b/packages/ice/ice_6.3.3.bb
index 2f0f9a2cce..7722bc4ae5 100644
--- a/packages/ice/ice_6.3.3.bb
+++ b/packages/ice/ice_6.3.3.bb
@@ -13,5 +13,5 @@ S = "${WORKDIR}/libICE-${PV}"
 inherit autotools pkgconfig 
 
 do_stage () {
-	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+	autotools_stage_all
 }
diff --git a/packages/ice/ice_cvs.bb b/packages/ice/ice_cvs.bb
index 06b4e60d5e..f3ead54e92 100644
--- a/packages/ice/ice_cvs.bb
+++ b/packages/ice/ice_cvs.bb
@@ -13,5 +13,5 @@ S = "${WORKDIR}/ICE"
 inherit autotools pkgconfig 
 
 do_stage () {
-	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+	autotools_stage_all
 }
diff --git a/packages/libidl/libidl_0.8.6.bb b/packages/libidl/libidl_0.8.6.bb
index 5a6f5800d6..ee63b92e0a 100644
--- a/packages/libidl/libidl_0.8.6.bb
+++ b/packages/libidl/libidl_0.8.6.bb
@@ -10,13 +10,7 @@ S = "${WORKDIR}/libIDL-${PV}"
 inherit autotools pkgconfig
 
 do_stage() {
-	oe_runmake install \
-		prefix=${STAGING_DIR} \
-		bindir=${STAGING_BINDIR} \
-		includedir=${STAGING_INCDIR} \
-		libdir=${STAGING_LIBDIR} \
-		datadir=${STAGING_DATADIR} \
-		infodir=${STAGING_INFODIR}
+	autotools_stage_all
 }
 
 FILES_${PN} = "${libdir}/*.so.*"
diff --git a/packages/libsm/libsm_6.0.3.bb b/packages/libsm/libsm_6.0.3.bb
index 6a85eaf6cc..2d78d3decb 100644
--- a/packages/libsm/libsm_6.0.3.bb
+++ b/packages/libsm/libsm_6.0.3.bb
@@ -13,5 +13,5 @@ S = "${WORKDIR}/libSM-${PV}"
 inherit autotools pkgconfig 
 
 do_stage () {
-	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+	autotools_stage_all
 }
diff --git a/packages/libsm/libsm_cvs.bb b/packages/libsm/libsm_cvs.bb
index 5be7c6966b..6c64da33d4 100644
--- a/packages/libsm/libsm_cvs.bb
+++ b/packages/libsm/libsm_cvs.bb
@@ -2,7 +2,6 @@ PV = "0.0+cvs${SRCDATE}"
 LICENSE = "MIT-X"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DEPENDS = "x11 ice"
 DESCRIPTION = "Session management library"
 PR = "r1"
@@ -13,5 +12,5 @@ S = "${WORKDIR}/SM"
 inherit autotools pkgconfig 
 
 do_stage () {
-	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+	autotools_stage_all
 }
diff --git a/packages/libxcursor/libxcursor_1.1.2.bb b/packages/libxcursor/libxcursor_1.1.2.bb
index d948ff50d1..25744c7dca 100644
--- a/packages/libxcursor/libxcursor_1.1.2.bb
+++ b/packages/libxcursor/libxcursor_1.1.2.bb
@@ -14,10 +14,5 @@ FILES_${PN} += "${libdir}/libXcursor.so"
 inherit autotools pkgconfig 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR} \
-	       mandir=${STAGING_DIR}/man
+	autotools_stage_all
 }
diff --git a/packages/libxcursor/libxcursor_cvs.bb b/packages/libxcursor/libxcursor_cvs.bb
index 1b50f5a7e2..a719652530 100644
--- a/packages/libxcursor/libxcursor_cvs.bb
+++ b/packages/libxcursor/libxcursor_cvs.bb
@@ -2,7 +2,6 @@ PV = "0.0+cvs${SRCDATE}"
 LICENSE= "BSD-X"
 SECTION = "x11/libs"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DESCRIPTION = "X Cursor library"
 DEPENDS = "libxfixes"
 PR = "r2"
@@ -14,10 +13,5 @@ FILES_${PN} += "${libdir}/libXcursor.so"
 inherit autotools pkgconfig 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR} \
-	       mandir=${STAGING_DIR}/man
+	autotools_stage_all
 }
diff --git a/packages/libxfixes/libxfixes_2.0.1.bb b/packages/libxfixes/libxfixes_2.0.1.bb
index b6560b8e8b..29e23e379d 100644
--- a/packages/libxfixes/libxfixes_2.0.1.bb
+++ b/packages/libxfixes/libxfixes_2.0.1.bb
@@ -11,9 +11,5 @@ S = "${WORKDIR}/libXfixes-${PV}"
 inherit autotools pkgconfig 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/packages/libxfixes/libxfixes_cvs.bb b/packages/libxfixes/libxfixes_cvs.bb
index a18ceeb0cc..6a9ae6194f 100644
--- a/packages/libxfixes/libxfixes_cvs.bb
+++ b/packages/libxfixes/libxfixes_cvs.bb
@@ -10,9 +10,5 @@ S = "${WORKDIR}/Xfixes"
 inherit autotools pkgconfig 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/packages/libxft/libxft_2.1.6.bb b/packages/libxft/libxft_2.1.6.bb
index d7cb351d63..12c8bdfb62 100644
--- a/packages/libxft/libxft_2.1.6.bb
+++ b/packages/libxft/libxft_2.1.6.bb
@@ -17,12 +17,7 @@ FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \
 inherit autotools pkgconfig 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR} \
-	       mandir=${STAGING_DATADIR}/man
+	autotools_stage_all
 }
 
 python do_package() {
diff --git a/packages/libxft/libxft_cvs.bb b/packages/libxft/libxft_cvs.bb
index 3827318cdd..6d5c11f36b 100644
--- a/packages/libxft/libxft_cvs.bb
+++ b/packages/libxft/libxft_cvs.bb
@@ -16,12 +16,7 @@ FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \
 inherit autotools pkgconfig 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR} \
-	       mandir=${STAGING_DATADIR}/man
+	autotools_stage_all
 }
 
 python do_package() {
diff --git a/packages/libxi/libxi_6.0.1.bb b/packages/libxi/libxi_6.0.1.bb
index b84aef8193..05ad22989f 100644
--- a/packages/libxi/libxi_6.0.1.bb
+++ b/packages/libxi/libxi_6.0.1.bb
@@ -11,10 +11,6 @@ S = "${WORKDIR}/libXi-${PV}"
 inherit autotools pkgconfig
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
 
diff --git a/packages/libxi/libxi_cvs.bb b/packages/libxi/libxi_cvs.bb
index cd8f777775..3935d4a636 100644
--- a/packages/libxi/libxi_cvs.bb
+++ b/packages/libxi/libxi_cvs.bb
@@ -12,10 +12,5 @@ S = "${WORKDIR}/Xi"
 inherit autotools pkgconfig 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR} \
-	       mandir=${STAGING_DATADIR}/man
+	autotools_stage_all
 }
diff --git a/packages/libxkbfile/libxkbfile_cvs.bb b/packages/libxkbfile/libxkbfile_cvs.bb
index c90d308194..9dcbfe78b3 100644
--- a/packages/libxkbfile/libxkbfile_cvs.bb
+++ b/packages/libxkbfile/libxkbfile_cvs.bb
@@ -2,7 +2,6 @@ LICENSE = "GPL"
 PV = "0.0+cvs${SRCDATE}"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DEPENDS = "x11"
 DESCRIPTION = "X11 keyboard library"
 
@@ -12,9 +11,5 @@ S = "${WORKDIR}/xkbfile"
 inherit autotools pkgconfig 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/packages/libxp/libxp_cvs.bb b/packages/libxp/libxp_cvs.bb
index 70bb20bf02..fa3abb1455 100644
--- a/packages/libxp/libxp_cvs.bb
+++ b/packages/libxp/libxp_cvs.bb
@@ -14,9 +14,5 @@ inherit autotools pkgconfig
 CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/packages/libxrandr/libxrandr_1.0.2.bb b/packages/libxrandr/libxrandr_1.0.2.bb
index 8d646539cb..ff32e0aa35 100644
--- a/packages/libxrandr/libxrandr_1.0.2.bb
+++ b/packages/libxrandr/libxrandr_1.0.2.bb
@@ -11,9 +11,5 @@ S = "${WORKDIR}/libXrandr-${PV}"
 inherit autotools pkgconfig 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/packages/libxrandr/libxrandr_cvs.bb b/packages/libxrandr/libxrandr_cvs.bb
index efc47e92ab..7617b752ef 100644
--- a/packages/libxrandr/libxrandr_cvs.bb
+++ b/packages/libxrandr/libxrandr_cvs.bb
@@ -11,10 +11,5 @@ S = "${WORKDIR}/Xrandr"
 inherit autotools pkgconfig 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR} \
-	       mandir=${STAGING_DATADIR}/man
+	autotools_stage_all
 }
diff --git a/packages/libxrender/libxrender_0.8.4.bb b/packages/libxrender/libxrender_0.8.4.bb
index 9257d5ef72..7c357b4c22 100644
--- a/packages/libxrender/libxrender_0.8.4.bb
+++ b/packages/libxrender/libxrender_0.8.4.bb
@@ -11,9 +11,5 @@ S = "${WORKDIR}/libXrender-${PV}"
 inherit autotools pkgconfig 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/packages/libxrender/libxrender_cvs.bb b/packages/libxrender/libxrender_cvs.bb
index ca6f16f1b8..c4d26b5c2d 100644
--- a/packages/libxrender/libxrender_cvs.bb
+++ b/packages/libxrender/libxrender_cvs.bb
@@ -11,9 +11,5 @@ S = "${WORKDIR}/Xrender"
 inherit autotools pkgconfig 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/packages/libxss/libxss_cvs.bb b/packages/libxss/libxss_cvs.bb
index b395583cc8..ea85e16da5 100644
--- a/packages/libxss/libxss_cvs.bb
+++ b/packages/libxss/libxss_cvs.bb
@@ -15,10 +15,5 @@ inherit autotools pkgconfig
 #CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR} \
-		mandir=${STAGING_DATADIR}/man
+	autotools_stage_all
 }
diff --git a/packages/libxv/libxv_2.2.2+cvs20040918.bb b/packages/libxv/libxv_2.2.2+cvs20040918.bb
index c0861cd8f9..374377a4c5 100644
--- a/packages/libxv/libxv_2.2.2+cvs20040918.bb
+++ b/packages/libxv/libxv_2.2.2+cvs20040918.bb
@@ -9,10 +9,5 @@ S = "${WORKDIR}/Xv"
 inherit autotools pkgconfig 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR} \
-	       mandir=${STAGING_DATADIR}/man
+	autotools_stage_all
 }
diff --git a/packages/libxv/libxv_2.2.2.bb b/packages/libxv/libxv_2.2.2.bb
index 63cb34033a..d52f3ef76c 100644
--- a/packages/libxv/libxv_2.2.2.bb
+++ b/packages/libxv/libxv_2.2.2.bb
@@ -9,9 +9,5 @@ S = "${WORKDIR}/libXv-${PV}"
 inherit autotools pkgconfig 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/packages/libxxf86vm/libxxf86vm_cvs.bb b/packages/libxxf86vm/libxxf86vm_cvs.bb
index 52e468dfce..f81a18d8db 100644
--- a/packages/libxxf86vm/libxxf86vm_cvs.bb
+++ b/packages/libxxf86vm/libxxf86vm_cvs.bb
@@ -11,9 +11,5 @@ S = "${WORKDIR}/Xxf86vm"
 inherit autotools pkgconfig 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/packages/startup-notification/startup-notification_0.8.bb b/packages/startup-notification/startup-notification_0.8.bb
index 664d313355..e6f934ddeb 100644
--- a/packages/startup-notification/startup-notification_0.8.bb
+++ b/packages/startup-notification/startup-notification_0.8.bb
@@ -10,5 +10,5 @@ inherit autotools pkgconfig
 SRC_URI = "http://www.freedesktop.org/software/startup-notification/releases/startup-notification-0.8.tar.gz"
 
 do_stage () {
-	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+	autotools_stage_all
 }
diff --git a/packages/xau/xau_0.1.1.bb b/packages/xau/xau_0.1.1.bb
index aa2c0ec858..3c8b4a030b 100644
--- a/packages/xau/xau_0.1.1.bb
+++ b/packages/xau/xau_0.1.1.bb
@@ -13,9 +13,5 @@ S = "${WORKDIR}/libXau-${PV}"
 inherit autotools pkgconfig 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/packages/xau/xau_cvs.bb b/packages/xau/xau_cvs.bb
index 58c47dd62f..46958baf19 100644
--- a/packages/xau/xau_cvs.bb
+++ b/packages/xau/xau_cvs.bb
@@ -13,10 +13,5 @@ S = "${WORKDIR}/Xau"
 inherit autotools pkgconfig 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR} \
-	       mandir=${STAGING_DATADIR}/man
+	autotools_stage_all
 }
diff --git a/packages/xaw/xaw_7.0.2.bb b/packages/xaw/xaw_7.0.2.bb
index 3515e0fac6..d75cefbdbb 100644
--- a/packages/xaw/xaw_7.0.2.bb
+++ b/packages/xaw/xaw_7.0.2.bb
@@ -16,5 +16,5 @@ inherit autotools pkgconfig
 BROKEN = "1"
 
 do_stage () {
-	oe_runmake install DESTDIR="" mandir=${STAGING_DATADIR}/man bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+	autotools_stage_all
 }
diff --git a/packages/xcalibrate/xcalibrate_cvs.bb b/packages/xcalibrate/xcalibrate_cvs.bb
index f28e0edf42..31a60a3202 100644
--- a/packages/xcalibrate/xcalibrate_cvs.bb
+++ b/packages/xcalibrate/xcalibrate_cvs.bb
@@ -2,7 +2,6 @@ PV = "0.0+cvs${SRCDATE}"
 LICENSE = "BSD-X"
 SECTION = "x11/libs"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@freedesktop.org>"
 DEPENDS = "x11 xcalibrateext xext"
 DESCRIPTION = "XCalibrate client-side library"
 
@@ -12,9 +11,5 @@ S = "${WORKDIR}/XCalibrate"
 inherit autotools pkgconfig 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/packages/xcalibrateext/xcalibrateext_cvs.bb b/packages/xcalibrateext/xcalibrateext_cvs.bb
index e242564233..133d19ee36 100644
--- a/packages/xcalibrateext/xcalibrateext_cvs.bb
+++ b/packages/xcalibrateext/xcalibrateext_cvs.bb
@@ -1,7 +1,6 @@
 PV = "0.0+cvs${SRCDATE}"
 SECTION = "x11/libs"
 LICENSE = "BSD-X"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DESCRIPTION = "XCalibrate extension headers"
 
 SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=XCalibrateExt"
@@ -10,9 +9,5 @@ S = "${WORKDIR}/XCalibrateExt"
 inherit autotools pkgconfig
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/packages/xcomposite/xcomposite_1.0.1.bb b/packages/xcomposite/xcomposite_1.0.1.bb
index 1e8d96ce2e..d31ec4dad7 100644
--- a/packages/xcomposite/xcomposite_1.0.1.bb
+++ b/packages/xcomposite/xcomposite_1.0.1.bb
@@ -11,9 +11,5 @@ S = "${WORKDIR}/libXcomposite-${PV}"
 inherit autotools pkgconfig 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/packages/xcomposite/xcomposite_cvs.bb b/packages/xcomposite/xcomposite_cvs.bb
index e0a7e2b647..8469e9c366 100644
--- a/packages/xcomposite/xcomposite_cvs.bb
+++ b/packages/xcomposite/xcomposite_cvs.bb
@@ -10,9 +10,5 @@ S = "${WORKDIR}/Xcomposite"
 inherit autotools pkgconfig 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/packages/xdamage/xdamage_1.0.1.bb b/packages/xdamage/xdamage_1.0.1.bb
index c8a41893e4..5b6c301374 100644
--- a/packages/xdamage/xdamage_1.0.1.bb
+++ b/packages/xdamage/xdamage_1.0.1.bb
@@ -12,9 +12,5 @@ S = "${WORKDIR}/libXdamage-${PV}"
 inherit autotools pkgconfig 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/packages/xdamage/xdamage_cvs.bb b/packages/xdamage/xdamage_cvs.bb
index 80c120b9bc..c10852783e 100644
--- a/packages/xdamage/xdamage_cvs.bb
+++ b/packages/xdamage/xdamage_cvs.bb
@@ -11,9 +11,5 @@ S = "${WORKDIR}/Xdamage"
 inherit autotools pkgconfig 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/packages/xdmcp/libxdmcp_0.1.1.bb b/packages/xdmcp/libxdmcp_0.1.1.bb
index 5136d564b8..19fba1529e 100644
--- a/packages/xdmcp/libxdmcp_0.1.1.bb
+++ b/packages/xdmcp/libxdmcp_0.1.1.bb
@@ -14,9 +14,5 @@ SRC_URI = "${XLIBS_MIRROR}/libXdmcp-${PV}.tar.bz2 \
 inherit autotools pkgconfig 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/packages/xdmcp/libxdmcp_0.1.3.bb b/packages/xdmcp/libxdmcp_0.1.3.bb
index 60d74e9f0e..aa2736cdb2 100644
--- a/packages/xdmcp/libxdmcp_0.1.3.bb
+++ b/packages/xdmcp/libxdmcp_0.1.3.bb
@@ -14,9 +14,5 @@ SRC_URI = "${XLIBS_MIRROR}/libXdmcp-${PV}.tar.bz2 \
 inherit autotools pkgconfig 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/packages/xdmcp/libxdmcp_cvs.bb b/packages/xdmcp/libxdmcp_cvs.bb
index befda49965..b4f0fdf368 100644
--- a/packages/xdmcp/libxdmcp_cvs.bb
+++ b/packages/xdmcp/libxdmcp_cvs.bb
@@ -14,9 +14,5 @@ S = "${WORKDIR}/Xdmcp"
 inherit autotools pkgconfig 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/packages/xext/xext_cvs.bb b/packages/xext/xext_cvs.bb
index d397a1b39f..84ecd349bc 100644
--- a/packages/xext/xext_cvs.bb
+++ b/packages/xext/xext_cvs.bb
@@ -10,12 +10,6 @@ SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xext"
 S = "${WORKDIR}/Xext"
 
 inherit autotools pkgconfig 
-
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR} \
-	       mandir=${STAGING_DATADIR}/man
+	autotools_stage_all
 }
diff --git a/packages/xextensions/xextensions_1.0.1.bb b/packages/xextensions/xextensions_1.0.1.bb
index 233d0c33b9..134614bd0c 100644
--- a/packages/xextensions/xextensions_1.0.1.bb
+++ b/packages/xextensions/xextensions_1.0.1.bb
@@ -9,9 +9,5 @@ S = "${WORKDIR}/xextensions-${PV}"
 inherit autotools pkgconfig
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/packages/xextensions/xextensions_20050610.bb b/packages/xextensions/xextensions_20050610.bb
index 06b8144a0f..735ba64a07 100644
--- a/packages/xextensions/xextensions_20050610.bb
+++ b/packages/xextensions/xextensions_20050610.bb
@@ -12,9 +12,5 @@ S = "${WORKDIR}/XExtensions"
 inherit autotools pkgconfig
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/packages/xextensions/xextensions_cvs.bb b/packages/xextensions/xextensions_cvs.bb
index 0970cebb0e..05dc2976ee 100644
--- a/packages/xextensions/xextensions_cvs.bb
+++ b/packages/xextensions/xextensions_cvs.bb
@@ -10,9 +10,5 @@ S = "${WORKDIR}/XExtensions"
 inherit autotools pkgconfig
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/packages/xfont/xfont_1.4.2.bb b/packages/xfont/xfont_1.4.2.bb
index 9f8720749a..7ef1d2b17f 100644
--- a/packages/xfont/xfont_1.4.2.bb
+++ b/packages/xfont/xfont_1.4.2.bb
@@ -14,9 +14,5 @@ S = "${WORKDIR}/libXfont-${PV}"
 inherit autotools pkgconfig 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/packages/xfont/xfont_cvs.bb b/packages/xfont/xfont_cvs.bb
index 74576a9da6..1873d74dfc 100644
--- a/packages/xfont/xfont_cvs.bb
+++ b/packages/xfont/xfont_cvs.bb
@@ -13,9 +13,5 @@ S = "${WORKDIR}/Xfont"
 inherit autotools pkgconfig 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/packages/xinerama/xinerama_1.0.2+cvs20050505.bb b/packages/xinerama/xinerama_1.0.2+cvs20050505.bb
index 114bd106ae..749fcc62d8 100644
--- a/packages/xinerama/xinerama_1.0.2+cvs20050505.bb
+++ b/packages/xinerama/xinerama_1.0.2+cvs20050505.bb
@@ -11,10 +11,5 @@ S = "${WORKDIR}/Xinerama"
 inherit autotools pkgconfig 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR} \
-	       mandir=${STAGING_DIR}/man
+	autotools_stage_all
 }
diff --git a/packages/xinerama/xinerama_1.0.2.bb b/packages/xinerama/xinerama_1.0.2.bb
index 99cdf12853..d67d750f46 100644
--- a/packages/xinerama/xinerama_1.0.2.bb
+++ b/packages/xinerama/xinerama_1.0.2.bb
@@ -12,10 +12,5 @@ S = "${WORKDIR}/libXinerama-${PV}"
 inherit autotools pkgconfig 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR} \
-	       mandir=${STAGING_DIR}/man
+	autotools_stage_all
 }
diff --git a/packages/xinerama/xinerama_cvs.bb b/packages/xinerama/xinerama_cvs.bb
index d55b29983a..3d3c854685 100644
--- a/packages/xinerama/xinerama_cvs.bb
+++ b/packages/xinerama/xinerama_cvs.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Xinerama library"
 LICENSE = "MIT"
 SECTION = "x11/libs"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DEPENDS = "panoramixext xproto x11 xext"
 PV = "0.0+cvs${SRCDATE}"
 
@@ -12,10 +11,5 @@ S = "${WORKDIR}/Xinerama"
 inherit autotools pkgconfig 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR} \
-	       mandir=${STAGING_DIR}/man
+	autotools_stage_all
 }
diff --git a/packages/xmu/xmu_cvs.bb b/packages/xmu/xmu_cvs.bb
index 7cf267dbb8..3f62a89643 100644
--- a/packages/xmu/xmu_cvs.bb
+++ b/packages/xmu/xmu_cvs.bb
@@ -2,7 +2,6 @@ PV = "0.0+cvs${SRCDATE}"
 LICENSE = "MIT"
 SECTION = "x11/libs"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DEPENDS = "xt xext"
 PR = "r2"
 
@@ -17,5 +16,5 @@ FILES_xmuu-dev = "${libdir}/libXmuu.so"
 inherit autotools pkgconfig 
 
 do_stage () {
-	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+	autotools_stage_all
 }
diff --git a/packages/xproto/xproto_6.6.2+cvs20050226.bb b/packages/xproto/xproto_6.6.2+cvs20050226.bb
index 33241b3d0d..a5a92fee40 100644
--- a/packages/xproto/xproto_6.6.2+cvs20050226.bb
+++ b/packages/xproto/xproto_6.6.2+cvs20050226.bb
@@ -9,10 +9,5 @@ S = "${WORKDIR}/Xproto"
 inherit autotools pkgconfig
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       mandir=${STAGING_DATADIR}/man \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/packages/xproto/xproto_6.6.2.bb b/packages/xproto/xproto_6.6.2.bb
index b982144485..b5cf751053 100644
--- a/packages/xproto/xproto_6.6.2.bb
+++ b/packages/xproto/xproto_6.6.2.bb
@@ -9,9 +9,5 @@ S = "${WORKDIR}/xproto-${PV}"
 inherit autotools pkgconfig
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/packages/xproto/xproto_cvs.bb b/packages/xproto/xproto_cvs.bb
index 3d625387b1..b5ecf2d7ef 100644
--- a/packages/xproto/xproto_cvs.bb
+++ b/packages/xproto/xproto_cvs.bb
@@ -11,10 +11,5 @@ inherit autotools pkgconfig
 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR} \
-	       mandir=${STAGING_DATADIR}/man
+	autotools_stage_all
 }
diff --git a/packages/xres/xres_1.0.1.bb b/packages/xres/xres_1.0.1.bb
index 0de731f98d..06226eb100 100644
--- a/packages/xres/xres_1.0.1.bb
+++ b/packages/xres/xres_1.0.1.bb
@@ -9,9 +9,5 @@ S = "${WORKDIR}/libXres-${PV}"
 inherit autotools pkgconfig 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/packages/xres/xres_cvs.bb b/packages/xres/xres_cvs.bb
index d8a64eb457..d7f8c68dfe 100644
--- a/packages/xres/xres_cvs.bb
+++ b/packages/xres/xres_cvs.bb
@@ -10,9 +10,5 @@ S = "${WORKDIR}/XRes"
 inherit autotools pkgconfig 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/packages/xt/xt_0.1.5.bb b/packages/xt/xt_0.1.5.bb
index 1d0d79458a..52235e2d97 100644
--- a/packages/xt/xt_0.1.5.bb
+++ b/packages/xt/xt_0.1.5.bb
@@ -24,5 +24,5 @@ do_compile() {
 }
 
 do_stage () {
-	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+	autotools_stage_all
 }
diff --git a/packages/xt/xt_cvs.bb b/packages/xt/xt_cvs.bb
index f3fb6e1790..fa240e4cad 100644
--- a/packages/xt/xt_cvs.bb
+++ b/packages/xt/xt_cvs.bb
@@ -22,11 +22,5 @@ do_compile() {
 
 
 do_stage () {
-	oe_runmake install \
-		DESTDIR="" \
-		prefix=${STAGING_DIR} \
-		bindir=${STAGING_BINDIR} \
-		includedir=${STAGING_INCDIR} \
-		libdir=${STAGING_LIBDIR} \
-		mandir=${STAGING_DATADIR}/man
+	autotools_stage_all
 }
diff --git a/packages/xtrans/xtrans_0.1.bb b/packages/xtrans/xtrans_0.1.bb
index 67bd3a2f38..8fee0d5089 100644
--- a/packages/xtrans/xtrans_0.1.bb
+++ b/packages/xtrans/xtrans_0.1.bb
@@ -11,9 +11,5 @@ S = "${WORKDIR}/libXtrans-${PV}"
 inherit autotools  pkgconfig
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/packages/xtrans/xtrans_cvs.bb b/packages/xtrans/xtrans_cvs.bb
index 6cb21a6692..86d5346680 100644
--- a/packages/xtrans/xtrans_cvs.bb
+++ b/packages/xtrans/xtrans_cvs.bb
@@ -12,9 +12,5 @@ S = "${WORKDIR}/xtrans"
 inherit autotools  pkgconfig
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/packages/xtst/xtst_cvs.bb b/packages/xtst/xtst_cvs.bb
index 22f09037a7..fab1ee2069 100644
--- a/packages/xtst/xtst_cvs.bb
+++ b/packages/xtst/xtst_cvs.bb
@@ -2,7 +2,6 @@ LICENSE = "GPL"
 PV = "0.0+cvs${SRCDATE}"
 SECTION = "x11/libs"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DEPENDS = "x11 recordext xext"
 DESCRIPTION = "X Test Extension: client side library"
 PR = "r3"
@@ -13,9 +12,5 @@ S = "${WORKDIR}/Xtst"
 inherit autotools pkgconfig 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/packages/xxf86dgaext/xxf86dgaext_cvs.bb b/packages/xxf86dgaext/xxf86dgaext_cvs.bb
index 4d8eafff85..9b46c91c1a 100644
--- a/packages/xxf86dgaext/xxf86dgaext_cvs.bb
+++ b/packages/xxf86dgaext/xxf86dgaext_cvs.bb
@@ -1,7 +1,6 @@
 PV = "0.0+cvs${SRCDATE}"
 LICENSE = "Xorg"
 SECTION = "x11/libs"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DESCRIPTION = "Xxf86dga extension headers"
 
 SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=XF86DGAExt"
@@ -10,9 +9,5 @@ S = "${WORKDIR}/XF86DGAExt"
 inherit autotools pkgconfig
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/packages/xxf86vmext/xxf86vmext_cvs.bb b/packages/xxf86vmext/xxf86vmext_cvs.bb
index a413bac1b2..181d763e32 100644
--- a/packages/xxf86vmext/xxf86vmext_cvs.bb
+++ b/packages/xxf86vmext/xxf86vmext_cvs.bb
@@ -1,7 +1,6 @@
 PV = "0.0+cvs${SRCDATE}"
 LICENSE = "MIT"
 SECTION = "x11/libs"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DESCRIPTION = "Xxf86vm extension headers"
 
 SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=XF86VMExt"
@@ -10,9 +9,5 @@ S = "${WORKDIR}/XF86VMExt"
 inherit autotools pkgconfig
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }