diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-06 23:18:06 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-06 23:18:06 +0100 |
| commit | 5a65c76bc3d72ea9f275a3c474d5e308cf367a82 (patch) | |
| tree | 532919ce0b59163e5e46e2ff396cba0ed68d1ef2 | |
| parent | b1044672f81740729faa21b266f2499b3e1e5396 (diff) | |
remove obsolete SUB_INSTALL stuff.
44 files changed, 51 insertions, 248 deletions
@@ -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 - new package minidlna - wget/curl/ftp download support - fix heimdal package -- check all patches for CFLAGS compliance +- check all patches for CFLAGS compliance, fhonour patch from FreeWRT - busybox update and SuSv3 removal - check rtc support on foxg20 - relocatable gcc (adk) diff --git a/package/DirectFB/Makefile b/package/DirectFB/Makefile index 45dc3e13f..21f1ec30b 100644 --- a/package/DirectFB/Makefile +++ b/package/DirectFB/Makefile @@ -43,11 +43,7 @@ ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y) XAKE_FLAGS+= LDEMULATION=elf64ltsmip endif -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_DIRECTFB_DEV}+= directfb-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_DIRECTFB}/etc ${INSTALL_DATA} ./files/directfbrc ${IDIR_DIRECTFB}/etc/ $(INSTALL_DIR) $(IDIR_DIRECTFB)/usr/lib/directfb-${PKG_EXTRAVER}/{inputdrivers,systems,wm} diff --git a/package/ImageMagick/Makefile b/package/ImageMagick/Makefile index 648befeeb..895b4c001 100644 --- a/package/ImageMagick/Makefile +++ b/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,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 -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: $(INSTALL_DIR) $(IDIR_LIBIMAGEMAGICK)/usr/lib $(INSTALL_DIR) $(IDIR_LIBIMAGEMAGICK)/usr/lib/${PKG_NAME}-${PKG_VERSION}/config $(INSTALL_DATA) $(WRKINST)/usr/lib/${PKG_NAME}-${PKG_VERSION}/config/* \ diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile index 679efb111..fdc0a08cd 100644 --- a/package/alsa-lib/Makefile +++ b/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 -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_ALSA_LIB_DEV}+= alsa-lib-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${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/share/alsa/* ${IDIR_ALSA_LIB}/usr/share/alsa/ diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index bdf44fb96..2b1fc70a5 100644 --- a/package/asterisk/Makefile +++ b/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_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 \ --with-ncurses=${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 ; \ 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) rm -rf $(IDIR_ASTERISK)/usr/sbin/astgenkey rm -rf $(IDIR_ASTERISK)/usr/bin diff --git a/package/busybox/Makefile b/package/busybox/Makefile index d0375cfe9..bcd582179 100644 --- a/package/busybox/Makefile +++ b/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,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 BUILD_STYLE:= manual INSTALL_STYLE:= manual @@ -60,7 +52,7 @@ else IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox endif -do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +do-install: ifeq ($(ADK_NATIVE),y) $(MAKE) V=1 \ IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE) diff --git a/package/curl/Makefile b/package/curl/Makefile index ab6e45416..c9992052a 100644 --- a/package/curl/Makefile +++ b/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_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_ARGS+= --disable-thread \ --enable-cookies \ @@ -63,7 +58,7 @@ else CONFIGURE_ARGS+= --disable-ipv6 endif -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBCURL}/usr/lib ${CP} ${WRKINST}/usr/lib/libcurl.so* ${IDIR_LIBCURL}/usr/lib/ diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 1eb65d222..c54538f0c 100644 --- a/package/e2fsprogs/Makefile +++ b/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,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 +TCFLAGS+= -pthread pre-build: ${MAKE} -C ${WRKBUILD}/util \ diff --git a/package/e2fsprogs/patches/patch-debugfs_dump_c.orig b/package/e2fsprogs/patches/patch-debugfs_dump_c.orig deleted file mode 100644 index 7e9b233fa..000000000 --- a/package/e2fsprogs/patches/patch-debugfs_dump_c.orig +++ /dev/null @@ -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 diff --git a/package/e2fsprogs/patches/patch-e2fsprogs_spec b/package/e2fsprogs/patches/patch-e2fsprogs_spec deleted file mode 100644 index ad10f98dc..000000000 --- a/package/e2fsprogs/patches/patch-e2fsprogs_spec +++ /dev/null @@ -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 diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index 0f15c3e10..50c75b1f2 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -20,10 +20,6 @@ CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_EGLIBC_DEV}+= eglibc-dev-install - EGLIBC_CONFOPTS:= \ --build=$(GNU_HOST_NAME) \ --host=$(REAL_GNU_TARGET_NAME) \ @@ -51,7 +47,7 @@ EGLIBC_ENV:= PATH='${TARGET_PATH}' \ libc_cv_slibdir="/lib" # 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 \ $(IDIR_EGLIBC)/usr/lib test -z $(ADK_RUNTIME_TIMEZONE) || \ diff --git a/package/expat/Makefile b/package/expat/Makefile index 28fde3a50..0ff841f4c 100644 --- a/package/expat/Makefile +++ b/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_DEV,libexpat-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBEXPAT_DEV},${PKGSC_LIBEXPAT_DEV})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBEXPAT_DEV}+= libexpat-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBEXPAT}/usr/lib ${CP} ${WRKINST}/usr/lib/libexpat.so* ${IDIR_LIBEXPAT}/usr/lib/ diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index bfcb74413..082bfe171 100644 --- a/package/ffmpeg/Makefile +++ b/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,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) CONFIGURE_CPU_OPTS:= --enable-mmx else @@ -76,7 +72,7 @@ CONFIGURE_ARGS:= --prefix=/usr \ --enable-libfaad \ ${CONFIGURE_CPU_OPTS} -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_FFMPEG}/usr/lib ${CP} ${WRKINST}/usr/lib/libavdevice.so* ${IDIR_FFMPEG}/usr/lib ${CP} ${WRKINST}/usr/lib/libavformat.so* ${IDIR_FFMPEG}/usr/lib diff --git a/package/glibc/Makefile b/package/glibc/Makefile index 8b4584373..f3e757d95 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -20,12 +20,8 @@ CONFIG_STYLE:= manual BUILD_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 -do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +do-install: ${INSTALL_DIR} $(IDIR_GLIBC)/lib $(IDIR_GLIBC)/etc test -z $(ADK_RUNTIME_TIMEZONE) || \ $(CP) /usr/share/zoneinfo/$(ADK_RUNTIME_TIMEZONE) \ diff --git a/package/iptables/Makefile b/package/iptables/Makefile index aac6179a0..d9229dc50 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -37,9 +37,7 @@ $(eval $(call PKG_template,IP6TABLES,ip6tables,${PKG_VERSION}-${PKG_RELEASE},${P CONFIGURE_ARGS+= --enable-devel -SUB_INSTALL-${ADK_PACKAGE_IP6TABLES}+= ip6tables-install - -post-install: ${SUB_INSTALL-m} ${SUB_INSTALL-y} +post-install: ${INSTALL_DIR} ${IDIR_IPTABLES}/{usr/lib,etc,usr/sbin} ${INSTALL_DATA} ./files/firewall.conf ${IDIR_IPTABLES}/etc ${CP} ${WRKINST}/usr/sbin/iptables* ${IDIR_IPTABLES}/usr/sbin/ diff --git a/package/jpeg/Makefile b/package/jpeg/Makefile index b4609e757..911e5c474 100644 --- a/package/jpeg/Makefile +++ b/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,JPEG_DEV,libjpeg-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_JPEG_DEV},${PKGSC_JPEG_DEV})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_JPEG_DEV}+= jpeg-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBJPEG}/usr/lib ${CP} ${WRKINST}/usr/lib/libjpeg.so* ${IDIR_LIBJPEG}/usr/lib/ diff --git a/package/krb5/Makefile b/package/krb5/Makefile index 3e49475b6..c7ec9955d 100644 --- a/package/krb5/Makefile +++ b/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,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 CONFIGURE_ARGS+= --disable-static \ --disable-profiled \ @@ -50,7 +46,7 @@ pre-build: # fix nm call in script, we need the GNU version of nm $(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/krb5kdc ${INSTALL_DIR} ${IDIR_KRB5_SERVER}/usr/sbin diff --git a/package/libX11/Makefile b/package/libX11/Makefile index 92f1f52aa..322c190a7 100644 --- a/package/libX11/Makefile +++ b/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_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 CONFIGURE_ARGS+= --enable-xlocale \ --disable-specs \ @@ -37,7 +33,7 @@ CONFIGURE_ARGS+= --enable-xlocale \ --disable-malloc0returnsnull \ --without-xcb -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBX11}/usr/lib ${IDIR_LIBX11}/usr/share/X11 ${CP} ${WRKINST}/usr/lib/libX11.so* ${IDIR_LIBX11}/usr/lib/ ${CP} ${WRKINST}/usr/share/X11/XKeysymDB ${IDIR_LIBX11}/usr/share/X11 diff --git a/package/libXau/Makefile b/package/libXau/Makefile index 21d31154e..41d6adcaf 100644 --- a/package/libXau/Makefile +++ b/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_DEV,libxau-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXAU_DEV},${PKGSC_LIBXAU_DEV},${PKG_OPTS})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBXAU_DEV}+=libxau-dev-install - - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBXAU}/usr/lib ${CP} ${WRKINST}/usr/lib/libXau.so* ${IDIR_LIBXAU}/usr/lib/ diff --git a/package/libXcomposite/Makefile b/package/libXcomposite/Makefile index fc395a708..48b1e3c82 100644 --- a/package/libXcomposite/Makefile +++ b/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_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 -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBXCOMPOSITE}/usr/lib ${CP} ${WRKINST}/usr/lib/libXcomposite.so* ${IDIR_LIBXCOMPOSITE}/usr/lib/ diff --git a/package/libXdmcp/Makefile b/package/libXdmcp/Makefile index f4a731f9c..4181933ca 100644 --- a/package/libXdmcp/Makefile +++ b/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_DEV,libxdmcp-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXDMCP_DEV},${PKGSC_LIBXDMCP_DEV},${PKG_OPTS})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBXDMCP_DEV}+=libxdmcp-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${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/* \ ${IDIR_LIBXDMCP_DEV}/usr/include/X11/ - include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libXext/Makefile b/package/libXext/Makefile index 3763d444f..ec311b067 100644 --- a/package/libXext/Makefile +++ b/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_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 -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBXEXT}/usr/lib ${CP} ${WRKINST}/usr/lib/libXext.so* ${IDIR_LIBXEXT}/usr/lib/ diff --git a/package/libevent/Makefile b/package/libevent/Makefile index 829162b10..a11099ab0 100644 --- a/package/libevent/Makefile +++ b/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_DEV,libevent-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBEVENT_DEV},${PKGSC_LIBEVENT_DEV})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBEVENT_DEV}+= libevent-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: $(INSTALL_DIR) $(IDIR_LIBEVENT)/usr/lib $(CP) $(WRKINST)/usr/lib/libevent*.so* \ $(IDIR_LIBEVENT)/usr/lib/ diff --git a/package/libmad/Makefile b/package/libmad/Makefile index 05cd0a948..0b708732d 100644 --- a/package/libmad/Makefile +++ b/package/libmad/Makefile @@ -30,10 +30,6 @@ endif #FPM:=mips #endif -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBMAD_DEV}+= libmad-dev-install - CONFIGURE_ARGS+= --enable-fpm=${FPM} \ --disable-debugging \ --enable-speed @@ -42,7 +38,7 @@ pre-install: ${INSTALL_DIR} ${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 ${CP} ${WRKINST}/usr/lib/libmad.so* ${IDIR_LIBMAD}/usr/lib/ diff --git a/package/libnl/Makefile b/package/libnl/Makefile index d7021a844..ab8be464e 100644 --- a/package/libnl/Makefile +++ b/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_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBNL_DEV},${PKGSC_LIBNL_DEV})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBNL_DEV}+= libnl-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBNL}/usr/lib ${CP} ${WRKINST}/usr/lib/libnl.so* ${IDIR_LIBNL}/usr/lib diff --git a/package/libogg/Makefile b/package/libogg/Makefile index a672bbe3a..f9d5e5fe9 100644 --- a/package/libogg/Makefile +++ b/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_DEV,libogg-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBOGG_DEV},${PKGSC_LIBOGG_DEV})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBOGG_DEV}+= libogg-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBOGG}/usr/lib ${CP} ${WRKINST}/usr/lib/libogg.so* ${IDIR_LIBOGG}/usr/lib/ diff --git a/package/libp11/Makefile b/package/libp11/Makefile index 9ba2fec39..8c3536e0e 100644 --- a/package/libp11/Makefile +++ b/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_DEV,libp11-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBP11_DEV},${PKGSC_LIBP11_DEV})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBP11_DEV}+= libp11-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBP11}/usr/lib ${CP} ${WRKINST}/usr/lib/libp11.so* ${IDIR_LIBP11}/usr/lib diff --git a/package/libpng/Makefile b/package/libpng/Makefile index 83408d1d3..92365bf63 100644 --- a/package/libpng/Makefile +++ b/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_DEV,libpng-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBPNG_DEV},${PKGSC_LIBPNG_DEV},${PKG_OPTS})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBPNG_DEV}+= libpng-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBPNG}/usr/lib ${CP} ${WRKINST}/usr/lib/libpng{,12}.so* ${IDIR_LIBPNG}/usr/lib/ diff --git a/package/libtiff/Makefile b/package/libtiff/Makefile index ebd9988bf..5ba22f507 100644 --- a/package/libtiff/Makefile +++ b/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_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 -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBTIFF}/usr/lib ${CP} ${WRKINST}/usr/lib/libtiff.so* ${IDIR_LIBTIFF}/usr/lib/ diff --git a/package/libtool/Makefile b/package/libtool/Makefile index e22290dcf..bfc3695eb 100644 --- a/package/libtool/Makefile +++ b/package/libtool/Makefile @@ -29,12 +29,7 @@ endif CONFIGURE_ARGS+= --enable-ltdl-install -SUB_INSTALLS-y:= -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} +post-install: ${INSTALL_DIR} ${IDIR_LIBTOOL}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/libtool ${IDIR_LIBTOOL}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/libtoolize ${IDIR_LIBTOOL}/usr/bin diff --git a/package/libusb-compat/Makefile b/package/libusb-compat/Makefile index d7f46c858..728f5b5d1 100644 --- a/package/libusb-compat/Makefile +++ b/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_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBUSB_COMPAT_DEV},${PKGSC_LIBUSB_COMPAT_DEV},${PKG_OPTS})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBUSB_COMPAT_DEV}+= libusb-compat-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBUSB_COMPAT}/usr/lib ${CP} ${WRKINST}/usr/lib/libusb*.so* ${IDIR_LIBUSB_COMPAT}/usr/lib/ diff --git a/package/libusb/Makefile b/package/libusb/Makefile index 4358bc720..189329275 100644 --- a/package/libusb/Makefile +++ b/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_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBUSB_DEV},${PKGSC_LIBUSB_DEV},${PKG_OPTS})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBUSB_DEV}+= libusb-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBUSB}/usr/lib ${CP} ${WRKINST}/usr/lib/libusb*.so* ${IDIR_LIBUSB}/usr/lib/ diff --git a/package/libvorbis/Makefile b/package/libvorbis/Makefile index 484ffa867..a980c64a7 100644 --- a/package/libvorbis/Makefile +++ b/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,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_ARGS+= --with-ogg="${STAGING_TARGET_DIR}/usr" \ --with-ogg-includes="${STAGING_TARGET_DIR}/usr/include" \ --with-ogg-libraries="${STAGING_TARGET_DIR}/usr/lib" -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBVORBIS}/usr/lib ${CP} ${WRKINST}/usr/lib/libvorbis.so* ${IDIR_LIBVORBIS}/usr/lib/ ${CP} ${WRKINST}/usr/lib/libvorbisfile.so* ${IDIR_LIBVORBIS}/usr/lib/ + +libvorbisenc-install: ${INSTALL_DIR} ${IDIR_LIBVORBISENC}/usr/lib ${CP} ${WRKINST}/usr/lib/libvorbisenc.so* ${IDIR_LIBVORBISENC}/usr/lib/ diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index c1b142dff..78b1c05cd 100644 --- a/package/ncurses/Makefile +++ b/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_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_ARGS+= --without-cxx \ --without-cxx-binding \ @@ -64,7 +60,7 @@ pre-configure: find ${WRKBUILD} -name *.o -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" rm -f ${WRKINST}/usr/lib/libcurses.so* echo 'GROUP(-lncurses)' >${WRKINST}/usr/lib/libcurses.so diff --git a/package/openct/Makefile b/package/openct/Makefile index 1164c4a13..b2e5e8a79 100644 --- a/package/openct/Makefile +++ b/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_DEV,libopenct-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBOPENCT_DEV},${PKGSC_LIBOPENCT_DEV})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBOPENCT_DEV}+= libopenct-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_OPENCT}/etc ${IDIR_OPENCT}/usr/{sbin,bin} ${INSTALL_BIN} ${WRKINST}/usr/sbin/openct-control \ ${IDIR_OPENCT}/usr/sbin diff --git a/package/opensc/Makefile b/package/opensc/Makefile index 96c3e4138..88a85939e 100644 --- a/package/opensc/Makefile +++ b/package/opensc/Makefile @@ -32,14 +32,10 @@ CONFIGURE_ARGS+= --disable-man \ --enable-pcsc \ --enable-openct -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBOPENSC_DEV}+= libopensc-dev-install - post-extract: 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/share/opensc ${INSTALL_DATA} ${WRKINST}/usr/share/opensc/* \ diff --git a/package/openssl/Makefile b/package/openssl/Makefile index f0fdc50fb..0d30b8f63 100644 --- a/package/openssl/Makefile +++ b/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,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 BUILD_STYLE:= manual @@ -74,10 +70,12 @@ do-build: OPTIMIZATION_FLAGS="$(TARGET_CFLAGS) -fPIC" \ all build-shared -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBOPENSSL}/usr/lib ${CP} ${WRKINST}/usr/lib/lib*.so* ${IDIR_LIBOPENSSL}/usr/lib chmod 644 ${IDIR_LIBOPENSSL}/usr/lib/lib*.so* + +openssl-util-install: ${INSTALL_DIR} ${IDIR_OPENSSL_UTIL}/usr/bin ${CP} ${WRKINST}/usr/bin/openssl ${IDIR_OPENSSL_UTIL}/usr/bin ${INSTALL_DIR} ${IDIR_OPENSSL_UTIL}/etc/ssl/{,certs,private} diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile index 774a63ea9..f2ecc8823 100644 --- a/package/openvpn/Makefile +++ b/package/openvpn/Makefile @@ -60,11 +60,7 @@ CONFIGURE_ARGS+= --disable-pthread \ --without-ifconfig-path \ --without-route-path -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${OPENVPN_EASY_RSA}+= openvpn-easy-rsa-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} $(IDIR_OPENVPN)/usr/sbin $(IDIR_OPENVPN)/etc/openvpn ${INSTALL_BIN} $(WRKINST)/usr/sbin/openvpn $(IDIR_OPENVPN)/usr/sbin/ $(CP) ./files/openvpn.conf $(IDIR_OPENVPN)/etc/openvpn/ diff --git a/package/pcsc-lite/Makefile b/package/pcsc-lite/Makefile index ca95456cc..003352a69 100644 --- a/package/pcsc-lite/Makefile +++ b/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 -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_PCSC_LITE_DEV}+= pcsc-lite-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: $(INSTALL_DIR) $(IDIR_PCSC_LITE)/etc/reader.conf.d $(INSTALL_DIR) $(IDIR_PCSC_LITE)/usr/sbin $(INSTALL_DIR) $(IDIR_PCSC_LITE)/usr/lib diff --git a/package/ppp/Makefile b/package/ppp/Makefile index 591f3ca2a..e711e005f 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -37,17 +37,7 @@ XAKE_FLAGS+= CC="${TARGET_CC}" \ DESTDIR="${WRKINST}/usr" \ TARGET_AR='${TARGET_CROSS}ar' -SUB_INSTALLS-y:= -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} +post-install: ${INSTALL_DIR} ${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/ diff --git a/package/sdl-image/Makefile b/package/sdl-image/Makefile index 37c0b9a98..8d6105e58 100644 --- a/package/sdl-image/Makefile +++ b/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_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 \ --enable-jpg \ --enable-bmp \ --enable-tif -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: $(INSTALL_DIR) $(IDIR_LIBSDL_IMAGE)/usr/lib $(CP) ${WRKINST}/usr/lib/libSDL*.so* $(IDIR_LIBSDL_IMAGE)/usr/lib diff --git a/package/sdl/Makefile b/package/sdl/Makefile index 9fb10463a..4b390bb6a 100644 --- a/package/sdl/Makefile +++ b/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_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 \ --disable-oss \ --enable-alsa \ @@ -39,7 +35,7 @@ CONFIGURE_ARGS+= --disable-esd \ --enable-input-tslib \ --with-x -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: $(INSTALL_DIR) $(IDIR_LIBSDL)/usr/lib $(CP) ${WRKINST}/usr/lib/libSDL*.so* $(IDIR_LIBSDL)/usr/lib diff --git a/package/uclibc/Makefile b/package/uclibc/Makefile index 5538cdfbd..4c4cb447b 100644 --- a/package/uclibc/Makefile +++ b/package/uclibc/Makefile @@ -23,12 +23,8 @@ CONFIG_STYLE:= manual BUILD_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-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 # create timezone file test -z $(ADK_RUNTIME_TIMEZONE) || \ diff --git a/package/ulogd/Makefile b/package/ulogd/Makefile index e1f4d0dc5..3010e7a92 100644 --- a/package/ulogd/Makefile +++ b/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_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 ifneq (${ADK_PACKAGE_ULOGD_MOD_MYSQL},) @@ -55,7 +48,7 @@ ifneq (${ADK_PACKAGE_ULOGD_MOD_SQLITE},) CONFIGURE_ARGS+= --with-sqlite3=${STAGING_TARGET_DIR}/usr endif -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_ULOGD}/usr/sbin ${IDIR_ULOGD}/usr/lib/ulogd/ ${INSTALL_BIN} ${WRKINST}/usr/lib/ulogd/ulogd_raw2packet_BASE.so \ ${IDIR_ULOGD}/usr/lib/ulogd/ |