remove PKG_MULTI var, add a more flexible method

1 files changed, 69 insertions, 11 deletions

diff --git a/package/sane-backends/Makefile b/package/sane-backends/Makefile
index 27ec9ac43..5d54f26f9 100644
--- a/package/sane-backends/Makefile
+++ b/package/sane-backends/Makefile
@@ -7,17 +7,16 @@ PKG_NAME:=		sane-backends
 PKG_VERSION:=		1.0.22
 PKG_RELEASE:=		3
 PKG_MD5SUM:=		fadf56a60f4776bfb24491f66b617cf5
-PKG_DESCR:=		Scanner access now easy
+PKG_DESCR:=		scanner access now easy
 PKG_SECTION:=		misc
 PKG_DEPENDS:=		libpthread
 PKG_BUILDDEP:=		libpthread libusb libusb-compat
 PKG_URL:=		http://www.sane-project.org/
 PKG_SITES:=		ftp://ftp2.sane-project.org/pub/sane/${PKG_NAME}-${PKG_VERSION}/
-PKG_MULTI:=		1
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-PKG_SUBPKGS:=		SANE_BACKENDS SANE_BACKEND_NET SANE_BACKEND_ABATON SANE_BACKEND_AGFAFOCUS
+PKG_SUBPKGS:=		SANE_BACKEND SANE_BACKEND_NET SANE_BACKEND_ABATON SANE_BACKEND_AGFAFOCUS
 PKG_SUBPKGS+=		SANE_BACKEND_APPLE SANE_BACKEND_ARTEC_EPLUS48U SANE_BACKEND_ARTEC SANE_BACKEND_AS6E
 PKG_SUBPKGS+=		SANE_BACKEND_AVISION SANE_BACKEND_BH SANE_BACKEND_CANON630U SANE_BACKEND_CANON
 PKG_SUBPKGS+=		SANE_BACKEND_COOLSCAN2 SANE_BACKEND_COOLSCAN SANE_BACKEND_DC25 SANE_BACKEND_DMC
@@ -34,6 +33,65 @@ PKG_SUBPKGS+=		SANE_BACKEND_STV680 SANE_BACKEND_TAMARACK SANE_BACKEND_TECO1 SANE
 PKG_SUBPKGS+=		SANE_BACKEND_TECO3 SANE_BACKEND_TEST SANE_BACKEND_U12 SANE_BACKEND_UMAX1220U
 PKG_SUBPKGS+=		SANE_BACKEND_UMAX_PP SANE_BACKEND_UMAX
 
+PKGSN_SANE_BACKEND_NET:=	sane-backend
+PKGSN_SANE_BACKEND_ABATON:=	sane-backend
+PKGSN_SANE_BACKEND_AGFAFOCUS:=	sane-backend
+PKGSN_SANE_BACKEND_APPLE:=	sane-backend
+PKGSN_SANE_BACKEND_ARTEC_EPLUS48U:=	sane-backend
+PKGSN_SANE_BACKEND_ARTEC:=	sane-backend
+PKGSN_SANE_BACKEND_AS6E:=	sane-backend
+PKGSN_SANE_BACKEND_AVISION:=	sane-backend
+PKGSN_SANE_BACKEND_BH:=		sane-backend
+PKGSN_SANE_BACKEND_CANON630U:=	sane-backend
+PKGSN_SANE_BACKEND_CANON:=	sane-backend
+PKGSN_SANE_BACKEND_COOLSCAN:=	sane-backend
+PKGSN_SANE_BACKEND_COOLSCAN2:=	sane-backend
+PKGSN_SANE_BACKEND_DC25:=	sane-backend
+PKGSN_SANE_BACKEND_DMC:=	sane-backend
+PKGSN_SANE_BACKEND_EPSON:=	sane-backend
+PKGSN_SANE_BACKEND_FUJITSU:=	sane-backend
+PKGSN_SANE_BACKEND_GENESYS:=	sane-backend
+PKGSN_SANE_BACKEND_GT68XX:=	sane-backend
+PKGSN_SANE_BACKEND_HP3500:=	sane-backend
+PKGSN_SANE_BACKEND_HP4200:=	sane-backend
+PKGSN_SANE_BACKEND_HP5400:=	sane-backend
+PKGSN_SANE_BACKEND_HP:=		sane-backend
+PKGSN_SANE_BACKEND_IBM:=	sane-backend
+PKGSN_SANE_BACKEND_LEO:=	sane-backend
+PKGSN_SANE_BACKEND_LEXMARK:=	sane-backend
+PKGSN_SANE_BACKEND_MA1509:=	sane-backend
+PKGSN_SANE_BACKEND_MATSUSHITA:=	sane-backend
+PKGSN_SANE_BACKEND_MICROTEK2:=	sane-backend
+PKGSN_SANE_BACKEND_MICROTEK:=	sane-backend
+PKGSN_SANE_BACKEND_MUSTEK:=	sane-backend
+PKGSN_SANE_BACKEND_MUSTEK_USB:=	sane-backend
+PKGSN_SANE_BACKEND_MUSTEK_USB2:=sane-backend
+PKGSN_SANE_BACKEND_NEC:=	sane-backend
+PKGSN_SANE_BACKEND_NIASH:=	sane-backend
+PKGSN_SANE_BACKEND_PIE:=	sane-backend
+PKGSN_SANE_BACKEND_PIXMA:=	sane-backend
+PKGSN_SANE_BACKEND_PLUSTEK_PP:=	sane-backend
+PKGSN_SANE_BACKEND_PLUSTEK:=	sane-backend
+PKGSN_SANE_BACKEND_RICOH:=	sane-backend
+PKGSN_SANE_BACKEND_S9036:=	sane-backend
+PKGSN_SANE_BACKEND_SCEPTRE:=	sane-backend
+PKGSN_SANE_BACKEND_SHARP:=	sane-backend
+PKGSN_SANE_BACKEND_SM3600:=	sane-backend
+PKGSN_SANE_BACKEND_SM3840:=	sane-backend
+PKGSN_SANE_BACKEND_SNAPSCAN:=	sane-backend
+PKGSN_SANE_BACKEND_SP15C:=	sane-backend
+PKGSN_SANE_BACKEND_ST400:=	sane-backend
+PKGSN_SANE_BACKEND_STV680:=	sane-backend
+PKGSN_SANE_BACKEND_TAMARACK:=	sane-backend
+PKGSN_SANE_BACKEND_TECO1:=	sane-backend
+PKGSN_SANE_BACKEND_TECO2:=	sane-backend
+PKGSN_SANE_BACKEND_TECO3:=	sane-backend
+PKGSN_SANE_BACKEND_TEST:=	sane-backend 
+PKGSN_SANE_BACKEND_U12:=	sane-backend 
+PKGSN_SANE_BACKEND_UMAX1220U:=	sane-backend
+PKGSN_SANE_BACKEND_UMAX_PP:=	sane-backend
+PKGSN_SANE_BACKEND_UMAX:=	sane-backend
+
 include ${TOPDIR}/mk/package.mk
 
 define PKG_mod_template
@@ -50,7 +108,7 @@ endif
 
 endef
 
-$(eval $(call PKG_template,SANE_BACKENDS,sane-backends,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SANE_BACKEND,sane-backend,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,SANE_BACKEND_NET,sane-backend-net,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,SANE_BACKEND_ABATON,sane-backend-abaton,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,SANE_BACKEND_AGFAFOCUS,sane-backend-agfafocus,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -174,12 +232,12 @@ CONFIGURE_ARGS+=	--disable-translations \
 			--enable-libusb
 
 post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
-	${INSTALL_DIR} ${IDIR_SANE_BACKENDS}/etc/sane.d
-	${INSTALL_DIR} ${IDIR_SANE_BACKENDS}/usr/lib
-	${INSTALL_DIR} ${IDIR_SANE_BACKENDS}/usr/sbin
-	${CP} ${WRKINST}/etc/sane.d/dll.conf ${IDIR_SANE_BACKENDS}/etc/sane.d
-	${CP} ${WRKINST}/etc/sane.d/saned.conf ${IDIR_SANE_BACKENDS}/etc/sane.d
-	${CP} ${WRKINST}/usr/sbin/saned ${IDIR_SANE_BACKENDS}/usr/sbin
-	${CP} ${WRKINST}/usr/lib/libsane*.so* ${IDIR_SANE_BACKENDS}/usr/lib
+	${INSTALL_DIR} ${IDIR_SANE_BACKEND}/etc/sane.d
+	${INSTALL_DIR} ${IDIR_SANE_BACKEND}/usr/lib
+	${INSTALL_DIR} ${IDIR_SANE_BACKEND}/usr/sbin
+	${CP} ${WRKINST}/etc/sane.d/dll.conf ${IDIR_SANE_BACKEND}/etc/sane.d
+	${CP} ${WRKINST}/etc/sane.d/saned.conf ${IDIR_SANE_BACKEND}/etc/sane.d
+	${CP} ${WRKINST}/usr/sbin/saned ${IDIR_SANE_BACKEND}/usr/sbin
+	${CP} ${WRKINST}/usr/lib/libsane*.so* ${IDIR_SANE_BACKEND}/usr/lib
 
 include ${TOPDIR}/mk/pkg-bottom.mk