Browse Source

remove obsolete SUB_INSTALL stuff.

Waldemar Brodkorb 14 years ago
parent
commit
5a65c76bc3
44 changed files with 51 additions and 248 deletions
  1. 5 1
      TODO
  2. 1 5
      package/DirectFB/Makefile
  3. 1 6
      package/ImageMagick/Makefile
  4. 1 5
      package/alsa-lib/Makefile
  5. 1 14
      package/asterisk/Makefile
  6. 1 9
      package/busybox/Makefile
  7. 1 6
      package/curl/Makefile
  8. 2 1
      package/e2fsprogs/Makefile
  9. 0 10
      package/e2fsprogs/patches/patch-debugfs_dump_c.orig
  10. 0 11
      package/e2fsprogs/patches/patch-e2fsprogs_spec
  11. 1 5
      package/eglibc/Makefile
  12. 1 5
      package/expat/Makefile
  13. 1 5
      package/ffmpeg/Makefile
  14. 1 5
      package/glibc/Makefile
  15. 1 3
      package/iptables/Makefile
  16. 1 5
      package/jpeg/Makefile
  17. 1 5
      package/krb5/Makefile
  18. 1 5
      package/libX11/Makefile
  19. 1 6
      package/libXau/Makefile
  20. 1 5
      package/libXcomposite/Makefile
  21. 1 6
      package/libXdmcp/Makefile
  22. 1 5
      package/libXext/Makefile
  23. 1 5
      package/libevent/Makefile
  24. 1 5
      package/libmad/Makefile
  25. 1 5
      package/libnl/Makefile
  26. 1 5
      package/libogg/Makefile
  27. 1 5
      package/libp11/Makefile
  28. 1 5
      package/libpng/Makefile
  29. 1 5
      package/libtiff/Makefile
  30. 1 6
      package/libtool/Makefile
  31. 1 5
      package/libusb-compat/Makefile
  32. 1 5
      package/libusb/Makefile
  33. 3 5
      package/libvorbis/Makefile
  34. 1 5
      package/ncurses/Makefile
  35. 1 5
      package/openct/Makefile
  36. 1 5
      package/opensc/Makefile
  37. 3 5
      package/openssl/Makefile
  38. 1 5
      package/openvpn/Makefile
  39. 1 5
      package/pcsc-lite/Makefile
  40. 1 11
      package/ppp/Makefile
  41. 1 5
      package/sdl-image/Makefile
  42. 1 5
      package/sdl/Makefile
  43. 1 5
      package/uclibc/Makefile
  44. 1 8
      package/ulogd/Makefile

+ 5 - 1
TODO

@@ -1,8 +1,12 @@
+- rework subinstall logic
+- fix autoreconf usage in opensc
+- fix timezone stuff in eglibc/glibc
+- add back aufs2 patches for kernel
 - openssl ocf support check
 - openssl ocf support check
 - new package minidlna
 - new package minidlna
 - wget/curl/ftp download support
 - wget/curl/ftp download support
 - fix heimdal package
 - fix heimdal package
-- check all patches for CFLAGS compliance
+- check all patches for CFLAGS compliance, fhonour patch from FreeWRT
 - busybox update and SuSv3 removal
 - busybox update and SuSv3 removal
 - check rtc support on foxg20
 - check rtc support on foxg20
 - relocatable gcc (adk)
 - relocatable gcc (adk)

+ 1 - 5
package/DirectFB/Makefile

@@ -43,11 +43,7 @@ ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y)
 XAKE_FLAGS+=		LDEMULATION=elf64ltsmip
 XAKE_FLAGS+=		LDEMULATION=elf64ltsmip
 endif
 endif
 
 
-SUB_INSTALLS-y:=
+post-install:
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_DIRECTFB_DEV}+=	directfb-dev-install
-
-post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} ${IDIR_DIRECTFB}/etc
 	${INSTALL_DIR} ${IDIR_DIRECTFB}/etc
 	${INSTALL_DATA} ./files/directfbrc ${IDIR_DIRECTFB}/etc/
 	${INSTALL_DATA} ./files/directfbrc ${IDIR_DIRECTFB}/etc/
 	$(INSTALL_DIR) $(IDIR_DIRECTFB)/usr/lib/directfb-${PKG_EXTRAVER}/{inputdrivers,systems,wm}
 	$(INSTALL_DIR) $(IDIR_DIRECTFB)/usr/lib/directfb-${PKG_EXTRAVER}/{inputdrivers,systems,wm}

+ 1 - 6
package/ImageMagick/Makefile

@@ -35,14 +35,9 @@ $(eval $(call PKG_template,LIBIMAGEMAGICK,libimagemagick,$(PKG_VERSION)-${PKG_RE
 $(eval $(call PKG_template,CONVERT,convert,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_CONVERT},${PKGSD_CONVERT},${PKGSC_CONVERT}))
 $(eval $(call PKG_template,CONVERT,convert,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_CONVERT},${PKGSD_CONVERT},${PKGSC_CONVERT}))
 $(eval $(call PKG_template,DISPLAY,display,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_DISPLAY},${PKGSD_DISPLAY},${PKGSC_DISPLAY}))
 $(eval $(call PKG_template,DISPLAY,display,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_DISPLAY},${PKGSD_DISPLAY},${PKGSC_DISPLAY}))
 
 
-SUB_INSTALLS-y:=
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_CONVERT}+=	convert-install
-SUB_INSTALLS-${ADK_PACKAGE_DISPLAY}+=	display-install
-
 CONFIGURE_ARGS+=	--with-magick-plus-plus=no
 CONFIGURE_ARGS+=	--with-magick-plus-plus=no
 
 
-post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
+post-install:
 	$(INSTALL_DIR) $(IDIR_LIBIMAGEMAGICK)/usr/lib
 	$(INSTALL_DIR) $(IDIR_LIBIMAGEMAGICK)/usr/lib
 	$(INSTALL_DIR) $(IDIR_LIBIMAGEMAGICK)/usr/lib/${PKG_NAME}-${PKG_VERSION}/config
 	$(INSTALL_DIR) $(IDIR_LIBIMAGEMAGICK)/usr/lib/${PKG_NAME}-${PKG_VERSION}/config
 	$(INSTALL_DATA) $(WRKINST)/usr/lib/${PKG_NAME}-${PKG_VERSION}/config/* \
 	$(INSTALL_DATA) $(WRKINST)/usr/lib/${PKG_NAME}-${PKG_VERSION}/config/* \

+ 1 - 5
package/alsa-lib/Makefile

@@ -25,11 +25,7 @@ $(eval $(call PKG_template,ALSA_LIB_DEV,alsa-lib-dev,${PKG_VERSION}-${PKG_RELEAS
 
 
 CONFIGURE_ARGS+=	--disable-python
 CONFIGURE_ARGS+=	--disable-python
 
 
-SUB_INSTALLS-y:=
+post-install:
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_ALSA_LIB_DEV}+=	alsa-lib-dev-install
-
-post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} ${IDIR_ALSA_LIB}/usr/lib ${IDIR_ALSA_LIB}/usr/share/alsa
 	${INSTALL_DIR} ${IDIR_ALSA_LIB}/usr/lib ${IDIR_ALSA_LIB}/usr/share/alsa
 	${CP} ${WRKINST}/usr/lib/libasound.so* ${IDIR_ALSA_LIB}/usr/lib/
 	${CP} ${WRKINST}/usr/lib/libasound.so* ${IDIR_ALSA_LIB}/usr/lib/
 	${CP} ${WRKINST}/usr/share/alsa/* ${IDIR_ALSA_LIB}/usr/share/alsa/
 	${CP} ${WRKINST}/usr/share/alsa/* ${IDIR_ALSA_LIB}/usr/share/alsa/

+ 1 - 14
package/asterisk/Makefile

@@ -44,19 +44,6 @@ $(eval $(call PKG_template,ASTERISK_CODEC_GSM,asterisk-codec-gsm,$(PKG_VERSION)-
 $(eval $(call PKG_template,ASTERISK_PBX_DUNDI,asterisk-pbx-dundi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_PBX_DUNDI,asterisk-pbx-dundi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_RES_AGI,asterisk-res-agi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_RES_AGI,asterisk-res-agi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 
-SUB_INSTALLS-y:=
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_PGSQL}+=		asterisk-pgsql-install
-SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_VOICEMAIL}+=	asterisk-voicemail-install
-SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_SOUNDS}+=		asterisk-sounds-install
-SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_CHAN_MGCP}+=	asterisk-chan-mgcp-install
-SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_CHAN_SKINNY}+=	asterisk-chan-skinny-install
-SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_CHAN_IAX2}+=	asterisk-chan-iax2-install
-SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_CODEC_SPEEX}+=	asterisk-codec-speex-install
-SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_CODEC_GSM}+=	asterisk-codec-gsm-install
-SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_PBX_DUNDI}+=	asterisk-pbx-dundi-install
-SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_RES_AGI}+=		asterisk-res-agi-install
-
 CONFIGURE_ARGS=		--with-z=${STAGING_TARGET_DIR}/usr \
 CONFIGURE_ARGS=		--with-z=${STAGING_TARGET_DIR}/usr \
 			--with-ncurses=${STAGING_TARGET_DIR}/usr \
 			--with-ncurses=${STAGING_TARGET_DIR}/usr \
 			--with-ssl=${STAGING_TARGET_DIR}/usr \
 			--with-ssl=${STAGING_TARGET_DIR}/usr \
@@ -132,7 +119,7 @@ post-build:
 	tar xzf asterisk-core-sounds-en-gsm-1.4.19.tar.gz ; \
 	tar xzf asterisk-core-sounds-en-gsm-1.4.19.tar.gz ; \
 	rm asterisk-core-sounds-en-gsm-1.4.19.tar.gz
 	rm asterisk-core-sounds-en-gsm-1.4.19.tar.gz
 
 
-do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
+do-install:
 	$(CP) $(WRKINST)/* $(IDIR_ASTERISK)
 	$(CP) $(WRKINST)/* $(IDIR_ASTERISK)
 	rm -rf $(IDIR_ASTERISK)/usr/sbin/astgenkey
 	rm -rf $(IDIR_ASTERISK)/usr/sbin/astgenkey
 	rm -rf $(IDIR_ASTERISK)/usr/bin
 	rm -rf $(IDIR_ASTERISK)/usr/bin

+ 1 - 9
package/busybox/Makefile

@@ -23,14 +23,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,BUSYBOX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,BUSYBOX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,UDHCPD,udhcpd,${PKG_VERSION}-${PKG_RELEASE},busybox,${PKGSD_UDHCPD},${PKGSC_UDHCPD}))
 $(eval $(call PKG_template,UDHCPD,udhcpd,${PKG_VERSION}-${PKG_RELEASE},busybox,${PKGSD_UDHCPD},${PKGSC_UDHCPD}))
 
 
-SUB_INSTALLS-y:=
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_UDHCPD}+=	udhcpd-install
-
-ifeq (${DEVELOPER},1)
-SUB_INSTALLS-y+=	udhcpd-install
-endif
-
 CONFIG_STYLE:=		manual
 CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 INSTALL_STYLE:=		manual
@@ -60,7 +52,7 @@ else
 	    IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox
 	    IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox
 endif
 endif
 
 
-do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
+do-install:
 ifeq ($(ADK_NATIVE),y)
 ifeq ($(ADK_NATIVE),y)
 	$(MAKE) V=1 \
 	$(MAKE) V=1 \
 	    IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE)
 	    IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE)

+ 1 - 6
package/curl/Makefile

@@ -30,11 +30,6 @@ $(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS
 $(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBCURL},${PKGSD_LIBCURL},${PKGSC_LIBCURL}))
 $(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBCURL},${PKGSD_LIBCURL},${PKGSC_LIBCURL}))
 $(eval $(call PKG_template,LIBCURL_DEV,libcurl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBCURL_DEV},${PKGSC_LIBCURL_DEV}))
 $(eval $(call PKG_template,LIBCURL_DEV,libcurl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBCURL_DEV},${PKGSC_LIBCURL_DEV}))
 
 
-SUB_INSTALLS-y:=
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_CURL}+=		curl-install
-SUB_INSTALLS-${ADK_PACKAGE_LIBCURL_DEV}+=	libcurl-dev-install
-
 CONFIGURE_ENV+=		curl_typeof_curl_socklen_t=socklen_t
 CONFIGURE_ENV+=		curl_typeof_curl_socklen_t=socklen_t
 CONFIGURE_ARGS+=	--disable-thread \
 CONFIGURE_ARGS+=	--disable-thread \
 			--enable-cookies \
 			--enable-cookies \
@@ -63,7 +58,7 @@ else
 CONFIGURE_ARGS+=	--disable-ipv6
 CONFIGURE_ARGS+=	--disable-ipv6
 endif
 endif
 
 
-post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
+post-install:
 	${INSTALL_DIR} ${IDIR_LIBCURL}/usr/lib
 	${INSTALL_DIR} ${IDIR_LIBCURL}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libcurl.so* ${IDIR_LIBCURL}/usr/lib/
 	${CP} ${WRKINST}/usr/lib/libcurl.so* ${IDIR_LIBCURL}/usr/lib/
 
 

+ 2 - 1
package/e2fsprogs/Makefile

@@ -33,8 +33,9 @@ $(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE},,
 $(eval $(call PKG_template,LIBSS,libss,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBSS},${PKGSC_LIBSS}))
 $(eval $(call PKG_template,LIBSS,libss,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBSS},${PKGSC_LIBSS}))
 $(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBLKID},${PKGSC_LIBBLKID}))
 $(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBLKID},${PKGSC_LIBBLKID}))
 
 
-CONFIGURE_ARGS+=	--enable-elf-shlibs --disable-tls
+CONFIGURE_ARGS+=	--enable-elf-shlibs --disable-rpath
 INSTALL_TARGET+=	install-libs
 INSTALL_TARGET+=	install-libs
+TCFLAGS+=		-pthread
 
 
 pre-build:
 pre-build:
 	${MAKE} -C ${WRKBUILD}/util \
 	${MAKE} -C ${WRKBUILD}/util \

+ 0 - 10
package/e2fsprogs/patches/patch-debugfs_dump_c.orig

@@ -1,10 +0,0 @@
---- e2fsprogs-1.41.14.orig/debugfs/dump.c	2009-08-13 03:39:57.000000000 +0200
-+++ e2fsprogs-1.41.14/debugfs/dump.c	2010-12-25 22:27:59.000000000 +0100
-@@ -19,7 +19,6 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
--#include <utime.h>
- #ifdef HAVE_GETOPT_H
- #include <getopt.h>
- #else

+ 0 - 11
package/e2fsprogs/patches/patch-e2fsprogs_spec

@@ -1,11 +0,0 @@
---- e2fsprogs-1.41.14.orig/e2fsprogs.spec	2010-12-13 14:57:34.000000000 +0100
-+++ e2fsprogs-1.41.14/e2fsprogs.spec	2010-12-25 22:24:46.000000000 +0100
-@@ -5,7 +5,7 @@
- 
- Summary: Utilities for managing ext2/ext3/ext4 filesystems
- Name: e2fsprogs
--Version: 1.41.13
-+Version: 1.41.14
- Release: 0
- License: GPLv2
- Group: System Environment/Base

+ 1 - 5
package/eglibc/Makefile

@@ -20,10 +20,6 @@ CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 
-SUB_INSTALLS-y:=
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_EGLIBC_DEV}+=	eglibc-dev-install
-
 EGLIBC_CONFOPTS:=	\
 EGLIBC_CONFOPTS:=	\
 			--build=$(GNU_HOST_NAME) \
 			--build=$(GNU_HOST_NAME) \
 			--host=$(REAL_GNU_TARGET_NAME) \
 			--host=$(REAL_GNU_TARGET_NAME) \
@@ -51,7 +47,7 @@ EGLIBC_ENV:=		PATH='${TARGET_PATH}' \
 			libc_cv_slibdir="/lib"
 			libc_cv_slibdir="/lib"
 
 
 # compile nothing, eglibc is already build in toolchain directory
 # compile nothing, eglibc is already build in toolchain directory
-do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
+do-install:
 	${INSTALL_DIR} $(IDIR_EGLIBC)/lib $(IDIR_EGLIBC)/etc \
 	${INSTALL_DIR} $(IDIR_EGLIBC)/lib $(IDIR_EGLIBC)/etc \
 		$(IDIR_EGLIBC)/usr/lib
 		$(IDIR_EGLIBC)/usr/lib
 	test -z $(ADK_RUNTIME_TIMEZONE) || \
 	test -z $(ADK_RUNTIME_TIMEZONE) || \

+ 1 - 5
package/expat/Makefile

@@ -25,11 +25,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,LIBEXPAT,libexpat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBEXPAT,libexpat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBEXPAT_DEV,libexpat-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBEXPAT_DEV},${PKGSC_LIBEXPAT_DEV}))
 $(eval $(call PKG_template,LIBEXPAT_DEV,libexpat-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBEXPAT_DEV},${PKGSC_LIBEXPAT_DEV}))
 
 
-SUB_INSTALLS-y:=
+post-install:
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_LIBEXPAT_DEV}+=	libexpat-dev-install
-
-post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} ${IDIR_LIBEXPAT}/usr/lib
 	${INSTALL_DIR} ${IDIR_LIBEXPAT}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libexpat.so* ${IDIR_LIBEXPAT}/usr/lib/
 	${CP} ${WRKINST}/usr/lib/libexpat.so* ${IDIR_LIBEXPAT}/usr/lib/
 
 

+ 1 - 5
package/ffmpeg/Makefile

@@ -27,10 +27,6 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,FFMPEG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,FFMPEG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,FFPLAY,ffplay,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_FFPLAY},${PKGSD_FFPLAY},${PKGSC_FFPLAY}))
 $(eval $(call PKG_template,FFPLAY,ffplay,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_FFPLAY},${PKGSD_FFPLAY},${PKGSC_FFPLAY}))
 
 
-SUB_INSTALLS-y:=
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_FFPLAY}+=	ffplay-install
-
 ifeq ($(ADK_TARGET_CPU_WITH_MMX),y)
 ifeq ($(ADK_TARGET_CPU_WITH_MMX),y)
 CONFIGURE_CPU_OPTS:=	--enable-mmx
 CONFIGURE_CPU_OPTS:=	--enable-mmx
 else
 else
@@ -76,7 +72,7 @@ CONFIGURE_ARGS:=	--prefix=/usr \
 			--enable-libfaad \
 			--enable-libfaad \
 			${CONFIGURE_CPU_OPTS}
 			${CONFIGURE_CPU_OPTS}
 
 
-post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
+post-install:
 	${INSTALL_DIR} ${IDIR_FFMPEG}/usr/lib
 	${INSTALL_DIR} ${IDIR_FFMPEG}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libavdevice.so* ${IDIR_FFMPEG}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libavdevice.so* ${IDIR_FFMPEG}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libavformat.so* ${IDIR_FFMPEG}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libavformat.so* ${IDIR_FFMPEG}/usr/lib

+ 1 - 5
package/glibc/Makefile

@@ -20,12 +20,8 @@ CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 
-SUB_INSTALLS-y:=
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_GLIBC_DEV}+=		glibc-dev-install
-
 # compile nothing, glibc is already build in toolchain directory
 # compile nothing, glibc is already build in toolchain directory
-do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
+do-install:
 	${INSTALL_DIR} $(IDIR_GLIBC)/lib $(IDIR_GLIBC)/etc
 	${INSTALL_DIR} $(IDIR_GLIBC)/lib $(IDIR_GLIBC)/etc
 	test -z $(ADK_RUNTIME_TIMEZONE) || \
 	test -z $(ADK_RUNTIME_TIMEZONE) || \
 	   $(CP) /usr/share/zoneinfo/$(ADK_RUNTIME_TIMEZONE) \
 	   $(CP) /usr/share/zoneinfo/$(ADK_RUNTIME_TIMEZONE) \

+ 1 - 3
package/iptables/Makefile

@@ -37,9 +37,7 @@ $(eval $(call PKG_template,IP6TABLES,ip6tables,${PKG_VERSION}-${PKG_RELEASE},${P
 
 
 CONFIGURE_ARGS+=	--enable-devel
 CONFIGURE_ARGS+=	--enable-devel
 
 
-SUB_INSTALL-${ADK_PACKAGE_IP6TABLES}+=			ip6tables-install
+post-install:
-
-post-install: ${SUB_INSTALL-m} ${SUB_INSTALL-y}
 	${INSTALL_DIR} ${IDIR_IPTABLES}/{usr/lib,etc,usr/sbin}
 	${INSTALL_DIR} ${IDIR_IPTABLES}/{usr/lib,etc,usr/sbin}
 	${INSTALL_DATA} ./files/firewall.conf ${IDIR_IPTABLES}/etc
 	${INSTALL_DATA} ./files/firewall.conf ${IDIR_IPTABLES}/etc
 	${CP} ${WRKINST}/usr/sbin/iptables* ${IDIR_IPTABLES}/usr/sbin/
 	${CP} ${WRKINST}/usr/sbin/iptables* ${IDIR_IPTABLES}/usr/sbin/

+ 1 - 5
package/jpeg/Makefile

@@ -27,11 +27,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,LIBJPEG,libjpeg,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBJPEG,libjpeg,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,JPEG_DEV,libjpeg-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_JPEG_DEV},${PKGSC_JPEG_DEV}))
 $(eval $(call PKG_template,JPEG_DEV,libjpeg-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_JPEG_DEV},${PKGSC_JPEG_DEV}))
 
 
-SUB_INSTALLS-y:=
+post-install:
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_JPEG_DEV}+=	jpeg-dev-install
-
-post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} ${IDIR_LIBJPEG}/usr/lib
 	${INSTALL_DIR} ${IDIR_LIBJPEG}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libjpeg.so* ${IDIR_LIBJPEG}/usr/lib/
 	${CP} ${WRKINST}/usr/lib/libjpeg.so* ${IDIR_LIBJPEG}/usr/lib/
 
 

+ 1 - 5
package/krb5/Makefile

@@ -27,10 +27,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,KRB5_SERVER,krb5-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,KRB5_SERVER,krb5-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBKRB5,libkrb5,$(PKG_VERSION)-${PKG_RELEASE},,${PKGSD_LIBKRB5},${PKGSC_LIBKRB5}))
 $(eval $(call PKG_template,LIBKRB5,libkrb5,$(PKG_VERSION)-${PKG_RELEASE},,${PKGSD_LIBKRB5},${PKGSC_LIBKRB5}))
 
 
-SUB_INSTALLS-y:=
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_LIBKRB5}+=	libkrb5-install
-
 TCFLAGS+=		-I${STAGING_TARGET_DIR}/usr/include/et
 TCFLAGS+=		-I${STAGING_TARGET_DIR}/usr/include/et
 CONFIGURE_ARGS+=	--disable-static \
 CONFIGURE_ARGS+=	--disable-static \
 			--disable-profiled \
 			--disable-profiled \
@@ -50,7 +46,7 @@ pre-build:
 	# fix nm call in script, we need the GNU version of nm
 	# fix nm call in script, we need the GNU version of nm
 	$(SED) "s#@@NM@@#${NM}#" ${WRKSRC}/util/export-check.pl
 	$(SED) "s#@@NM@@#${NM}#" ${WRKSRC}/util/export-check.pl
 
 
-post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
+post-install:
 	${INSTALL_DIR} ${IDIR_KRB5_SERVER}/etc
 	${INSTALL_DIR} ${IDIR_KRB5_SERVER}/etc
 	${INSTALL_DIR} ${IDIR_KRB5_SERVER}/etc/krb5kdc
 	${INSTALL_DIR} ${IDIR_KRB5_SERVER}/etc/krb5kdc
 	${INSTALL_DIR} ${IDIR_KRB5_SERVER}/usr/sbin
 	${INSTALL_DIR} ${IDIR_KRB5_SERVER}/usr/sbin

+ 1 - 5
package/libX11/Makefile

@@ -26,10 +26,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,LIBX11,libx11,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBX11,libx11,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBX11_DEV,libx11-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBX11_DEV},${PKGSC_LIBX11_DEV},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBX11_DEV,libx11-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBX11_DEV},${PKGSC_LIBX11_DEV},${PKG_OPTS}))
 
 
-SUB_INSTALLS-y:=
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_LIBX11_DEV}+=libx11-dev-install
-
 XAKE_FLAGS+=		HOSTCPPFLAGS=-I${STAGING_TARGET_DIR}/usr/include/xproto
 XAKE_FLAGS+=		HOSTCPPFLAGS=-I${STAGING_TARGET_DIR}/usr/include/xproto
 CONFIGURE_ARGS+=	--enable-xlocale \
 CONFIGURE_ARGS+=	--enable-xlocale \
 			--disable-specs \
 			--disable-specs \
@@ -37,7 +33,7 @@ CONFIGURE_ARGS+=	--enable-xlocale \
 			--disable-malloc0returnsnull \
 			--disable-malloc0returnsnull \
 			--without-xcb
 			--without-xcb
 
 
-post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
+post-install:
 	${INSTALL_DIR} ${IDIR_LIBX11}/usr/lib ${IDIR_LIBX11}/usr/share/X11
 	${INSTALL_DIR} ${IDIR_LIBX11}/usr/lib ${IDIR_LIBX11}/usr/share/X11
 	${CP} ${WRKINST}/usr/lib/libX11.so* ${IDIR_LIBX11}/usr/lib/
 	${CP} ${WRKINST}/usr/lib/libX11.so* ${IDIR_LIBX11}/usr/lib/
 	${CP} ${WRKINST}/usr/share/X11/XKeysymDB ${IDIR_LIBX11}/usr/share/X11
 	${CP} ${WRKINST}/usr/share/X11/XKeysymDB ${IDIR_LIBX11}/usr/share/X11

+ 1 - 6
package/libXau/Makefile

@@ -24,12 +24,7 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,LIBXAU,libxau,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBXAU,libxau,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBXAU_DEV,libxau-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXAU_DEV},${PKGSC_LIBXAU_DEV},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBXAU_DEV,libxau-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXAU_DEV},${PKGSC_LIBXAU_DEV},${PKG_OPTS}))
 
 
-SUB_INSTALLS-y:=
+post-install:
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_LIBXAU_DEV}+=libxau-dev-install
-
-
-post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} ${IDIR_LIBXAU}/usr/lib
 	${INSTALL_DIR} ${IDIR_LIBXAU}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXau.so* ${IDIR_LIBXAU}/usr/lib/
 	${CP} ${WRKINST}/usr/lib/libXau.so* ${IDIR_LIBXAU}/usr/lib/
 
 

+ 1 - 5
package/libXcomposite/Makefile

@@ -25,13 +25,9 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,LIBXCOMPOSITE,libxcomposite,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBXCOMPOSITE,libxcomposite,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBXCOMPOSITE_DEV,libxcomposite-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXCOMPOSITE_DEV},${PKGSC_LIBXCOMPOSITE_DEV},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBXCOMPOSITE_DEV,libxcomposite-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXCOMPOSITE_DEV},${PKGSC_LIBXCOMPOSITE_DEV},${PKG_OPTS}))
 
 
-SUB_INSTALLS-y:=
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_LIBXCOMPOSITE_DEV}+=	libxcomposite-dev-install
-
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 
 
-post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
+post-install:
 	${INSTALL_DIR} ${IDIR_LIBXCOMPOSITE}/usr/lib
 	${INSTALL_DIR} ${IDIR_LIBXCOMPOSITE}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXcomposite.so* ${IDIR_LIBXCOMPOSITE}/usr/lib/
 	${CP} ${WRKINST}/usr/lib/libXcomposite.so* ${IDIR_LIBXCOMPOSITE}/usr/lib/
 
 

+ 1 - 6
package/libXdmcp/Makefile

@@ -24,11 +24,7 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,LIBXDMCP,libxdmcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBXDMCP,libxdmcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBXDMCP_DEV,libxdmcp-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXDMCP_DEV},${PKGSC_LIBXDMCP_DEV},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBXDMCP_DEV,libxdmcp-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXDMCP_DEV},${PKGSC_LIBXDMCP_DEV},${PKG_OPTS}))
 
 
-SUB_INSTALLS-y:=
+post-install:
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_LIBXDMCP_DEV}+=libxdmcp-dev-install
-
-post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} ${IDIR_LIBXDMCP}/usr/lib
 	${INSTALL_DIR} ${IDIR_LIBXDMCP}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXdmcp.so* ${IDIR_LIBXDMCP}/usr/lib/
 	${CP} ${WRKINST}/usr/lib/libXdmcp.so* ${IDIR_LIBXDMCP}/usr/lib/
 
 
@@ -37,5 +33,4 @@ libxdmcp-dev-install:
 	${CP} ${WRKINST}/usr/include/X11/* \
 	${CP} ${WRKINST}/usr/include/X11/* \
 		${IDIR_LIBXDMCP_DEV}/usr/include/X11/
 		${IDIR_LIBXDMCP_DEV}/usr/include/X11/
 	
 	
-
 include ${TOPDIR}/mk/pkg-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk

+ 1 - 5
package/libXext/Makefile

@@ -25,13 +25,9 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,LIBXEXT,libxext,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBXEXT,libxext,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBXEXT_DEV,libxext-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXEXT_DEV},${PKGSC_LIBXEXT_DEV},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBXEXT_DEV,libxext-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXEXT_DEV},${PKGSC_LIBXEXT_DEV},${PKG_OPTS}))
 
 
-SUB_INSTALLS-y:=
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_LIBXEXT_DEV}+=libxext-dev-install
-
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 
 
-post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
+post-install:
 	${INSTALL_DIR} ${IDIR_LIBXEXT}/usr/lib
 	${INSTALL_DIR} ${IDIR_LIBXEXT}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXext.so* ${IDIR_LIBXEXT}/usr/lib/
 	${CP} ${WRKINST}/usr/lib/libXext.so* ${IDIR_LIBXEXT}/usr/lib/
 
 

+ 1 - 5
package/libevent/Makefile

@@ -21,11 +21,7 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,LIBEVENT,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBEVENT,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBEVENT_DEV,libevent-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBEVENT_DEV},${PKGSC_LIBEVENT_DEV}))
 $(eval $(call PKG_template,LIBEVENT_DEV,libevent-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBEVENT_DEV},${PKGSC_LIBEVENT_DEV}))
 
 
-SUB_INSTALLS-y:=
+post-install:
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_LIBEVENT_DEV}+=	libevent-dev-install
-
-post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	$(INSTALL_DIR) $(IDIR_LIBEVENT)/usr/lib
 	$(INSTALL_DIR) $(IDIR_LIBEVENT)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libevent*.so* \
 	$(CP) $(WRKINST)/usr/lib/libevent*.so* \
 		$(IDIR_LIBEVENT)/usr/lib/
 		$(IDIR_LIBEVENT)/usr/lib/

+ 1 - 5
package/libmad/Makefile

@@ -30,10 +30,6 @@ endif
 #FPM:=mips
 #FPM:=mips
 #endif
 #endif
 
 
-SUB_INSTALLS-y:=
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_LIBMAD_DEV}+=	libmad-dev-install
-
 CONFIGURE_ARGS+=	--enable-fpm=${FPM} \
 CONFIGURE_ARGS+=	--enable-fpm=${FPM} \
 			--disable-debugging \
 			--disable-debugging \
 			--enable-speed
 			--enable-speed
@@ -42,7 +38,7 @@ pre-install:
 	${INSTALL_DIR} ${WRKINST}/usr/lib/pkgconfig
 	${INSTALL_DIR} ${WRKINST}/usr/lib/pkgconfig
 	${CP} ./files/mad.pc ${WRKINST}/usr/lib/pkgconfig
 	${CP} ./files/mad.pc ${WRKINST}/usr/lib/pkgconfig
 
 
-post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
+post-install:
 	${INSTALL_DIR} ${IDIR_LIBMAD}/usr/lib
 	${INSTALL_DIR} ${IDIR_LIBMAD}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libmad.so* ${IDIR_LIBMAD}/usr/lib/
 	${CP} ${WRKINST}/usr/lib/libmad.so* ${IDIR_LIBMAD}/usr/lib/
 
 

+ 1 - 5
package/libnl/Makefile

@@ -20,11 +20,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,LIBNL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBNL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBNL_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBNL_DEV},${PKGSC_LIBNL_DEV}))
 $(eval $(call PKG_template,LIBNL_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBNL_DEV},${PKGSC_LIBNL_DEV}))
 
 
-SUB_INSTALLS-y:=
+post-install:
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_LIBNL_DEV}+=	libnl-dev-install
-
-post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} ${IDIR_LIBNL}/usr/lib
 	${INSTALL_DIR} ${IDIR_LIBNL}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libnl.so* ${IDIR_LIBNL}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libnl.so* ${IDIR_LIBNL}/usr/lib
 
 

+ 1 - 5
package/libogg/Makefile

@@ -21,11 +21,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,LIBOGG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBOGG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBOGG_DEV,libogg-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBOGG_DEV},${PKGSC_LIBOGG_DEV}))
 $(eval $(call PKG_template,LIBOGG_DEV,libogg-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBOGG_DEV},${PKGSC_LIBOGG_DEV}))
 
 
-SUB_INSTALLS-y:=
+post-install:
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_LIBOGG_DEV}+=	libogg-dev-install
-
-post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} ${IDIR_LIBOGG}/usr/lib
 	${INSTALL_DIR} ${IDIR_LIBOGG}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libogg.so* ${IDIR_LIBOGG}/usr/lib/
 	${CP} ${WRKINST}/usr/lib/libogg.so* ${IDIR_LIBOGG}/usr/lib/
 
 

+ 1 - 5
package/libp11/Makefile

@@ -23,11 +23,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,LIBP11,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBP11,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBP11_DEV,libp11-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBP11_DEV},${PKGSC_LIBP11_DEV}))
 $(eval $(call PKG_template,LIBP11_DEV,libp11-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBP11_DEV},${PKGSC_LIBP11_DEV}))
 
 
-SUB_INSTALLS-y:=
+post-install:
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_LIBP11_DEV}+=	libp11-dev-install
-
-post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} ${IDIR_LIBP11}/usr/lib
 	${INSTALL_DIR} ${IDIR_LIBP11}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libp11.so* ${IDIR_LIBP11}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libp11.so* ${IDIR_LIBP11}/usr/lib
 
 

+ 1 - 5
package/libpng/Makefile

@@ -27,11 +27,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,LIBPNG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBPNG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBPNG_DEV,libpng-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBPNG_DEV},${PKGSC_LIBPNG_DEV},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBPNG_DEV,libpng-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBPNG_DEV},${PKGSC_LIBPNG_DEV},${PKG_OPTS}))
 
 
-SUB_INSTALLS-y:=
+post-install:
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_LIBPNG_DEV}+=	libpng-dev-install
-
-post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} ${IDIR_LIBPNG}/usr/lib
 	${INSTALL_DIR} ${IDIR_LIBPNG}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libpng{,12}.so* ${IDIR_LIBPNG}/usr/lib/
 	${CP} ${WRKINST}/usr/lib/libpng{,12}.so* ${IDIR_LIBPNG}/usr/lib/
 
 

+ 1 - 5
package/libtiff/Makefile

@@ -28,13 +28,9 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,LIBTIFF,libtiff,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBTIFF,libtiff,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBTIFF_DEV,libtiff-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBTIFF_DEV},${PKGSC_LIBTIFF_DEV},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBTIFF_DEV,libtiff-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBTIFF_DEV},${PKGSC_LIBTIFF_DEV},${PKG_OPTS}))
 
 
-SUB_INSTALLS-y:=
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_LIBTIFF_DEV}+=	libtiff-dev-install
-
 CONFIGURE_ARGS+=	--disable-cxx
 CONFIGURE_ARGS+=	--disable-cxx
 
 
-post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
+post-install:
 	${INSTALL_DIR} ${IDIR_LIBTIFF}/usr/lib
 	${INSTALL_DIR} ${IDIR_LIBTIFF}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libtiff.so* ${IDIR_LIBTIFF}/usr/lib/
 	${CP} ${WRKINST}/usr/lib/libtiff.so* ${IDIR_LIBTIFF}/usr/lib/
 
 

+ 1 - 6
package/libtool/Makefile

@@ -29,12 +29,7 @@ endif
 
 
 CONFIGURE_ARGS+=	--enable-ltdl-install
 CONFIGURE_ARGS+=	--enable-ltdl-install
 
 
-SUB_INSTALLS-y:=
+post-install:
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_LIBLTDL}+=		libltdl-install
-SUB_INSTALLS-${ADK_PACKAGE_LIBLTDL_DEV}+=	libltdl-dev-install
-
-post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} ${IDIR_LIBTOOL}/usr/bin
 	${INSTALL_DIR} ${IDIR_LIBTOOL}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/libtool ${IDIR_LIBTOOL}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/libtool ${IDIR_LIBTOOL}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/libtoolize ${IDIR_LIBTOOL}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/libtoolize ${IDIR_LIBTOOL}/usr/bin

+ 1 - 5
package/libusb-compat/Makefile

@@ -28,11 +28,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,LIBUSB_COMPAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBUSB_COMPAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBUSB_COMPAT_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBUSB_COMPAT_DEV},${PKGSC_LIBUSB_COMPAT_DEV},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBUSB_COMPAT_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBUSB_COMPAT_DEV},${PKGSC_LIBUSB_COMPAT_DEV},${PKG_OPTS}))
 
 
-SUB_INSTALLS-y:=
+post-install:
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_LIBUSB_COMPAT_DEV}+=	libusb-compat-dev-install
-
-post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} ${IDIR_LIBUSB_COMPAT}/usr/lib
 	${INSTALL_DIR} ${IDIR_LIBUSB_COMPAT}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libusb*.so* ${IDIR_LIBUSB_COMPAT}/usr/lib/
 	${CP} ${WRKINST}/usr/lib/libusb*.so* ${IDIR_LIBUSB_COMPAT}/usr/lib/
 
 

+ 1 - 5
package/libusb/Makefile

@@ -27,11 +27,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,LIBUSB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBUSB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBUSB_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBUSB_DEV},${PKGSC_LIBUSB_DEV},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBUSB_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBUSB_DEV},${PKGSC_LIBUSB_DEV},${PKG_OPTS}))
 
 
-SUB_INSTALLS-y:=
+post-install:
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_LIBUSB_DEV}+=	libusb-dev-install
-
-post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} ${IDIR_LIBUSB}/usr/lib
 	${INSTALL_DIR} ${IDIR_LIBUSB}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libusb*.so* ${IDIR_LIBUSB}/usr/lib/
 	${CP} ${WRKINST}/usr/lib/libusb*.so* ${IDIR_LIBUSB}/usr/lib/
 
 

+ 3 - 5
package/libvorbis/Makefile

@@ -23,19 +23,17 @@ $(eval $(call PKG_template,LIBVORBIS,libvorbis,${PKG_VERSION}-${PKG_RELEASE},${P
 $(eval $(call PKG_template,LIBVORBISENC,libvorbisenc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBVORBISENC,libvorbisenc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBVORBIS_DEV,libvorbis-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBVORBIS_DEV},${PKGSC_LIBVORBIS_DEV}))
 $(eval $(call PKG_template,LIBVORBIS_DEV,libvorbis-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBVORBIS_DEV},${PKGSC_LIBVORBIS_DEV}))
 
 
-SUB_INSTALLS-y:=
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_LIBVORBIS_DEV}+=	libvorbis-dev-install
-
 CONFIGURE_ENV+=		LIBS="-lm -logg"
 CONFIGURE_ENV+=		LIBS="-lm -logg"
 CONFIGURE_ARGS+=	--with-ogg="${STAGING_TARGET_DIR}/usr" \
 CONFIGURE_ARGS+=	--with-ogg="${STAGING_TARGET_DIR}/usr" \
 			--with-ogg-includes="${STAGING_TARGET_DIR}/usr/include" \
 			--with-ogg-includes="${STAGING_TARGET_DIR}/usr/include" \
 			--with-ogg-libraries="${STAGING_TARGET_DIR}/usr/lib"
 			--with-ogg-libraries="${STAGING_TARGET_DIR}/usr/lib"
 
 
-post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
+post-install:
 	${INSTALL_DIR} ${IDIR_LIBVORBIS}/usr/lib
 	${INSTALL_DIR} ${IDIR_LIBVORBIS}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libvorbis.so* ${IDIR_LIBVORBIS}/usr/lib/
 	${CP} ${WRKINST}/usr/lib/libvorbis.so* ${IDIR_LIBVORBIS}/usr/lib/
 	${CP} ${WRKINST}/usr/lib/libvorbisfile.so* ${IDIR_LIBVORBIS}/usr/lib/
 	${CP} ${WRKINST}/usr/lib/libvorbisfile.so* ${IDIR_LIBVORBIS}/usr/lib/
+
+libvorbisenc-install:
 	${INSTALL_DIR} ${IDIR_LIBVORBISENC}/usr/lib
 	${INSTALL_DIR} ${IDIR_LIBVORBISENC}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libvorbisenc.so* ${IDIR_LIBVORBISENC}/usr/lib/
 	${CP} ${WRKINST}/usr/lib/libvorbisenc.so* ${IDIR_LIBVORBISENC}/usr/lib/
 
 

+ 1 - 5
package/ncurses/Makefile

@@ -21,10 +21,6 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,LIBNCURSES,libncurses,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBNCURSES,libncurses,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBNCURSES_DEV,libncurses-dev,${PKG_VERSION}-${PKG_RELEASE},libncurses,${PKGSD_LIBNCURSES_DEV},${PKGSC_LIBNCURSES_DEV}))
 $(eval $(call PKG_template,LIBNCURSES_DEV,libncurses-dev,${PKG_VERSION}-${PKG_RELEASE},libncurses,${PKGSD_LIBNCURSES_DEV},${PKGSC_LIBNCURSES_DEV}))
 
 
-SUB_INSTALLS-y:=
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_LIBNCURSES_DEV}+=	libncurses-dev-install
-
 CONFIGURE_ENV+=		ac_cv_linux_vers=2
 CONFIGURE_ENV+=		ac_cv_linux_vers=2
 CONFIGURE_ARGS+=	--without-cxx \
 CONFIGURE_ARGS+=	--without-cxx \
 			--without-cxx-binding \
 			--without-cxx-binding \
@@ -64,7 +60,7 @@ pre-configure:
 	find ${WRKBUILD} -name *.o -exec rm {} \;
 	find ${WRKBUILD} -name *.o -exec rm {} \;
 	find ${WRKBUILD} -name *.a -exec rm {} \;
 	find ${WRKBUILD} -name *.a -exec rm {} \;
 
 
-post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
+post-install:
 	# this is installed as libncurses - make libcurses a "link"
 	# this is installed as libncurses - make libcurses a "link"
 	rm -f ${WRKINST}/usr/lib/libcurses.so*
 	rm -f ${WRKINST}/usr/lib/libcurses.so*
 	echo 'GROUP(-lncurses)' >${WRKINST}/usr/lib/libcurses.so
 	echo 'GROUP(-lncurses)' >${WRKINST}/usr/lib/libcurses.so

+ 1 - 5
package/openct/Makefile

@@ -27,11 +27,7 @@ $(eval $(call PKG_template,OPENCT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PK
 $(eval $(call PKG_template,LIBOPENCT,libopenct,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBOPENCT},${PKGSD_LIBOPENCT},${PKGSC_LIBOPENCT}))
 $(eval $(call PKG_template,LIBOPENCT,libopenct,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBOPENCT},${PKGSD_LIBOPENCT},${PKGSC_LIBOPENCT}))
 $(eval $(call PKG_template,LIBOPENCT_DEV,libopenct-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBOPENCT_DEV},${PKGSC_LIBOPENCT_DEV}))
 $(eval $(call PKG_template,LIBOPENCT_DEV,libopenct-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBOPENCT_DEV},${PKGSC_LIBOPENCT_DEV}))
 
 
-SUB_INSTALLS-y:=
+post-install:
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_LIBOPENCT_DEV}+=	libopenct-dev-install
-
-post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} ${IDIR_OPENCT}/etc ${IDIR_OPENCT}/usr/{sbin,bin}
 	${INSTALL_DIR} ${IDIR_OPENCT}/etc ${IDIR_OPENCT}/usr/{sbin,bin}
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/openct-control \
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/openct-control \
 		${IDIR_OPENCT}/usr/sbin
 		${IDIR_OPENCT}/usr/sbin

+ 1 - 5
package/opensc/Makefile

@@ -32,14 +32,10 @@ CONFIGURE_ARGS+=	--disable-man \
 			--enable-pcsc \
 			--enable-pcsc \
 			--enable-openct
 			--enable-openct
 
 
-SUB_INSTALLS-y:=
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_LIBOPENSC_DEV}+=	libopensc-dev-install
-
 post-extract:
 post-extract:
 	cd ${WRKBUILD} && autoreconf -vif
 	cd ${WRKBUILD} && autoreconf -vif
 
 
-post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
+post-install:
 	${INSTALL_DIR} ${IDIR_OPENSC}/usr/bin
 	${INSTALL_DIR} ${IDIR_OPENSC}/usr/bin
 	${INSTALL_DIR} ${IDIR_OPENSC}/usr/share/opensc
 	${INSTALL_DIR} ${IDIR_OPENSC}/usr/share/opensc
 	${INSTALL_DATA} ${WRKINST}/usr/share/opensc/* \
 	${INSTALL_DATA} ${WRKINST}/usr/share/opensc/* \

+ 3 - 5
package/openssl/Makefile

@@ -32,10 +32,6 @@ $(eval $(call PKG_template,LIBOPENSSL,libopenssl,${PKG_VERSION}-${PKG_RELEASE},$
 $(eval $(call PKG_template,LIBOPENSSL_DEV,libopenssl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBOPENSSL_DEV},${PKGSD_LIBOPENSSL_DEV},${PKGSC_LIBOPENSSL_DEV}))
 $(eval $(call PKG_template,LIBOPENSSL_DEV,libopenssl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBOPENSSL_DEV},${PKGSD_LIBOPENSSL_DEV},${PKGSC_LIBOPENSSL_DEV}))
 $(eval $(call PKG_template,OPENSSL_UTIL,openssl-util,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_OPENSSL_UTIL},${PKGSD_OPENSSL_UTIL},${PKGSC_OPENSSL_UTIL}))
 $(eval $(call PKG_template,OPENSSL_UTIL,openssl-util,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_OPENSSL_UTIL},${PKGSD_OPENSSL_UTIL},${PKGSC_OPENSSL_UTIL}))
 
 
-SUB_INSTALLS-y:=
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_LIBOPENSSL_DEV}+=	libopenssl-dev-install
-
 CONFIG_STYLE:=		manual
 CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 BUILD_STYLE:=		manual
 
 
@@ -74,10 +70,12 @@ do-build:
 		OPTIMIZATION_FLAGS="$(TARGET_CFLAGS) -fPIC" \
 		OPTIMIZATION_FLAGS="$(TARGET_CFLAGS) -fPIC" \
 		all build-shared
 		all build-shared
 
 
-post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
+post-install:
 	${INSTALL_DIR} ${IDIR_LIBOPENSSL}/usr/lib
 	${INSTALL_DIR} ${IDIR_LIBOPENSSL}/usr/lib
 	${CP} ${WRKINST}/usr/lib/lib*.so* ${IDIR_LIBOPENSSL}/usr/lib
 	${CP} ${WRKINST}/usr/lib/lib*.so* ${IDIR_LIBOPENSSL}/usr/lib
 	chmod 644 ${IDIR_LIBOPENSSL}/usr/lib/lib*.so*
 	chmod 644 ${IDIR_LIBOPENSSL}/usr/lib/lib*.so*
+
+openssl-util-install:
 	${INSTALL_DIR} ${IDIR_OPENSSL_UTIL}/usr/bin
 	${INSTALL_DIR} ${IDIR_OPENSSL_UTIL}/usr/bin
 	${CP} ${WRKINST}/usr/bin/openssl ${IDIR_OPENSSL_UTIL}/usr/bin
 	${CP} ${WRKINST}/usr/bin/openssl ${IDIR_OPENSSL_UTIL}/usr/bin
 	${INSTALL_DIR} ${IDIR_OPENSSL_UTIL}/etc/ssl/{,certs,private}
 	${INSTALL_DIR} ${IDIR_OPENSSL_UTIL}/etc/ssl/{,certs,private}

+ 1 - 5
package/openvpn/Makefile

@@ -60,11 +60,7 @@ CONFIGURE_ARGS+=	--disable-pthread \
 			--without-ifconfig-path \
 			--without-ifconfig-path \
 			--without-route-path
 			--without-route-path
 
 
-SUB_INSTALLS-y:=
+post-install:
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${OPENVPN_EASY_RSA}+=	openvpn-easy-rsa-install
-
-post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} $(IDIR_OPENVPN)/usr/sbin $(IDIR_OPENVPN)/etc/openvpn
 	${INSTALL_DIR} $(IDIR_OPENVPN)/usr/sbin $(IDIR_OPENVPN)/etc/openvpn
 	${INSTALL_BIN} $(WRKINST)/usr/sbin/openvpn $(IDIR_OPENVPN)/usr/sbin/
 	${INSTALL_BIN} $(WRKINST)/usr/sbin/openvpn $(IDIR_OPENVPN)/usr/sbin/
 	$(CP) ./files/openvpn.conf $(IDIR_OPENVPN)/etc/openvpn/
 	$(CP) ./files/openvpn.conf $(IDIR_OPENVPN)/etc/openvpn/

+ 1 - 5
package/pcsc-lite/Makefile

@@ -27,11 +27,7 @@ $(eval $(call PKG_template,PCSC_LITE_DEV,$(PKG_NAME)-dev,$(PKG_VERSION)-${PKG_RE
 
 
 CONFIGURE_ARGS+=	--disable-libhal
 CONFIGURE_ARGS+=	--disable-libhal
 
 
-SUB_INSTALLS-y:=
+post-install:
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_PCSC_LITE_DEV}+=	pcsc-lite-dev-install
-
-post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	$(INSTALL_DIR) $(IDIR_PCSC_LITE)/etc/reader.conf.d
 	$(INSTALL_DIR) $(IDIR_PCSC_LITE)/etc/reader.conf.d
 	$(INSTALL_DIR) $(IDIR_PCSC_LITE)/usr/sbin
 	$(INSTALL_DIR) $(IDIR_PCSC_LITE)/usr/sbin
 	$(INSTALL_DIR) $(IDIR_PCSC_LITE)/usr/lib
 	$(INSTALL_DIR) $(IDIR_PCSC_LITE)/usr/lib

+ 1 - 11
package/ppp/Makefile

@@ -37,17 +37,7 @@ XAKE_FLAGS+=		CC="${TARGET_CC}" \
 			DESTDIR="${WRKINST}/usr" \
 			DESTDIR="${WRKINST}/usr" \
 			TARGET_AR='${TARGET_CROSS}ar'
 			TARGET_AR='${TARGET_CROSS}ar'
 
 
-SUB_INSTALLS-y:=
+post-install:
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_PPP_MOD_PPPOE}+=		mod-pppoe-install
-SUB_INSTALLS-${ADK_PACKAGE_PPP_MOD_PPPOA}+=		mod-pppoa-install
-SUB_INSTALLS-${ADK_PACKAGE_PPP_MOD_RADIUS}+=		mod-radius-install
-SUB_INSTALLS-${ADK_PACKAGE_PPP_MOD_CHAT}+=		mod-chat-install
-SUB_INSTALLS-${ADK_PACKAGE_PPP_MOD_PPPDUMP}+=		mod-pppdump-install
-SUB_INSTALLS-${ADK_PACKAGE_PPP_MOD_PPPSTATS}+=		mod-pppstats-install
-SUB_INSTALLS-${ADK_PACKAGE_PPP_MOD_PPPUMTS}+=		mod-pppumts-install
-
-post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} ${IDIR_PPP}/etc/ppp
 	${INSTALL_DIR} ${IDIR_PPP}/etc/ppp
 	install -m0600 ./files/etc/ppp/chap-secrets ${IDIR_PPP}/etc/ppp/
 	install -m0600 ./files/etc/ppp/chap-secrets ${IDIR_PPP}/etc/ppp/
 	${INSTALL_DATA} ./files/etc/ppp/options ${IDIR_PPP}/etc/ppp/
 	${INSTALL_DATA} ./files/etc/ppp/options ${IDIR_PPP}/etc/ppp/

+ 1 - 5
package/sdl-image/Makefile

@@ -26,16 +26,12 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,LIBSDL_IMAGE,libsdl-image,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBSDL_IMAGE,libsdl-image,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBSDL_IMAGE_DEV,libsdl-image-dev,$(PKG_VERSION)-${PKG_RELEASE},libsdl-image,${PKGSD_LIBSDL_IMAGE_DEV},${PKGSC_LIBSDL_IMAGE_DEV}))
 $(eval $(call PKG_template,LIBSDL_IMAGE_DEV,libsdl-image-dev,$(PKG_VERSION)-${PKG_RELEASE},libsdl-image,${PKGSD_LIBSDL_IMAGE_DEV},${PKGSC_LIBSDL_IMAGE_DEV}))
 
 
-SUB_INSTALLS-y:=
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_LIBSDL_IMAGE_DEV}+=	libsdl-image-dev-install
-
 CONFIGURE_ARGS+=	--enable-png \
 CONFIGURE_ARGS+=	--enable-png \
 			--enable-jpg \
 			--enable-jpg \
 			--enable-bmp \
 			--enable-bmp \
 			--enable-tif
 			--enable-tif
 
 
-post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
+post-install:
 	$(INSTALL_DIR) $(IDIR_LIBSDL_IMAGE)/usr/lib
 	$(INSTALL_DIR) $(IDIR_LIBSDL_IMAGE)/usr/lib
 	$(CP) ${WRKINST}/usr/lib/libSDL*.so* $(IDIR_LIBSDL_IMAGE)/usr/lib
 	$(CP) ${WRKINST}/usr/lib/libSDL*.so* $(IDIR_LIBSDL_IMAGE)/usr/lib
 
 

+ 1 - 5
package/sdl/Makefile

@@ -26,10 +26,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,LIBSDL,libsdl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBSDL,libsdl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBSDL_DEV,libsdl-dev,$(PKG_VERSION)-${PKG_RELEASE},libsdl,${PKGSD_LIBSDL_DEV},${PKGSC_LIBSDL_DEV}))
 $(eval $(call PKG_template,LIBSDL_DEV,libsdl-dev,$(PKG_VERSION)-${PKG_RELEASE},libsdl,${PKGSD_LIBSDL_DEV},${PKGSC_LIBSDL_DEV}))
 
 
-SUB_INSTALLS-y:=
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_LIBSDL_DEV}+=	libsdl-dev-install
-
 CONFIGURE_ARGS+=	--disable-esd \
 CONFIGURE_ARGS+=	--disable-esd \
 			--disable-oss \
 			--disable-oss \
 			--enable-alsa \
 			--enable-alsa \
@@ -39,7 +35,7 @@ CONFIGURE_ARGS+=	--disable-esd \
 			--enable-input-tslib \
 			--enable-input-tslib \
 			--with-x
 			--with-x
 
 
-post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
+post-install:
 	$(INSTALL_DIR) $(IDIR_LIBSDL)/usr/lib
 	$(INSTALL_DIR) $(IDIR_LIBSDL)/usr/lib
 	$(CP) ${WRKINST}/usr/lib/libSDL*.so* $(IDIR_LIBSDL)/usr/lib
 	$(CP) ${WRKINST}/usr/lib/libSDL*.so* $(IDIR_LIBSDL)/usr/lib
 
 

+ 1 - 5
package/uclibc/Makefile

@@ -23,12 +23,8 @@ CONFIG_STYLE:=          manual
 BUILD_STYLE:=           manual
 BUILD_STYLE:=           manual
 INSTALL_STYLE:=         manual
 INSTALL_STYLE:=         manual
 
 
-SUB_INSTALLS-y:=
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_UCLIBC_DEV}+=	uclibc-dev-install
-
 # do nothing, uClibc is already build in toolchain directory
 # do nothing, uClibc is already build in toolchain directory
-do-install: $(STAGING_TARGET_DIR)/lib/libc.so ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
+do-install: $(STAGING_TARGET_DIR)/lib/libc.so
 	${INSTALL_DIR} $(IDIR_UCLIBC)/lib $(IDIR_UCLIBC)/etc
 	${INSTALL_DIR} $(IDIR_UCLIBC)/lib $(IDIR_UCLIBC)/etc
 	# create timezone file
 	# create timezone file
 	test -z $(ADK_RUNTIME_TIMEZONE) || \
 	test -z $(ADK_RUNTIME_TIMEZONE) || \

+ 1 - 8
package/ulogd/Makefile

@@ -34,13 +34,6 @@ $(eval $(call PKG_template,ULOGD_MOD_PGSQL,ulogd-mod-pgsql,${PKG_VERSION}-${PKG_
 $(eval $(call PKG_template,ULOGD_MOD_SQLITE,ulogd-mod-sqlite,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,ULOGD_MOD_SQLITE,ulogd-mod-sqlite,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,ULOGD_MOD_EXTRA,ulogd-mod-extra,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,ULOGD_MOD_EXTRA,ulogd-mod-extra,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 
-SUB_INSTALLS-y:=
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_ULOGD_MOD_MYSQL}+=		ulogd-mod-mysql-install
-SUB_INSTALLS-${ADK_PACKAGE_ULOGD_MOD_PGSQL}+=		ulogd-mod-pgsql-install
-SUB_INSTALLS-${ADK_PACKAGE_ULOGD_MOD_SQLITE}+=		ulogd-mod-sqlite-install
-SUB_INSTALLS-${ADK_PACKAGE_ULOGD_MOD_EXTRA}+=		ulogd-mod-extra-install
-
 TCFLAGS+=		-fPIC
 TCFLAGS+=		-fPIC
 
 
 ifneq (${ADK_PACKAGE_ULOGD_MOD_MYSQL},)
 ifneq (${ADK_PACKAGE_ULOGD_MOD_MYSQL},)
@@ -55,7 +48,7 @@ ifneq (${ADK_PACKAGE_ULOGD_MOD_SQLITE},)
 CONFIGURE_ARGS+=	--with-sqlite3=${STAGING_TARGET_DIR}/usr
 CONFIGURE_ARGS+=	--with-sqlite3=${STAGING_TARGET_DIR}/usr
 endif
 endif
 
 
-post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
+post-install:
 	${INSTALL_DIR} ${IDIR_ULOGD}/usr/sbin ${IDIR_ULOGD}/usr/lib/ulogd/
 	${INSTALL_DIR} ${IDIR_ULOGD}/usr/sbin ${IDIR_ULOGD}/usr/lib/ulogd/
 	${INSTALL_BIN} ${WRKINST}/usr/lib/ulogd/ulogd_raw2packet_BASE.so \
 	${INSTALL_BIN} ${WRKINST}/usr/lib/ulogd/ulogd_raw2packet_BASE.so \
 		${IDIR_ULOGD}/usr/lib/ulogd/
 		${IDIR_ULOGD}/usr/lib/ulogd/