diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/sdl-image/Makefile | 12 | ||||
| -rw-r--r-- | package/sdl/Makefile | 11 | ||||
| -rw-r--r-- | package/vsftpd/files/vsftpd.conf | 1 |
3 files changed, 22 insertions, 2 deletions
diff --git a/package/sdl-image/Makefile b/package/sdl-image/Makefile index 1840817c6..d7cd7a2e7 100644 --- a/package/sdl-image/Makefile +++ b/package/sdl-image/Makefile @@ -20,6 +20,11 @@ WRKDIST= ${WRKDIR}/SDL_image-${PKG_VERSION} 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,${PKG_DESCR},${PKG_SECTION})) + +SUB_INSTALLS-y:= +SUB_INSTALLS-m:= +SUB_INSTALLS-${ADK_PACKAGE_LIBSDL_IMAGE_DEV}+= libsdl-image-dev-install CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --enable-png \ @@ -29,8 +34,13 @@ CONFIGURE_ARGS+= --enable-png \ BUILD_STYLE:= auto INSTALL_STYLE:= auto -post-install: +post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} $(INSTALL_DIR) $(IDIR_LIBSDL_IMAGE)/usr/lib $(CP) ${WRKINST}/usr/lib/libSDL*.so* $(IDIR_LIBSDL_IMAGE)/usr/lib +libsdl-image-dev-install: + $(INSTALL_DIR) $(IDIR_LIBSDL_IMAGE_DEV)/usr/include/SDL + $(CP) ${WRKINST}/usr/include/SDL/*.h \ + $(IDIR_LIBSDL_IMAGE_DEV)/usr/include/SDL + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/sdl/Makefile b/package/sdl/Makefile index 04526773c..f5f9ff6aa 100644 --- a/package/sdl/Makefile +++ b/package/sdl/Makefile @@ -20,6 +20,11 @@ WRKDIST= ${WRKDIR}/SDL-${PKG_VERSION} 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,${PKG_DESCR},${PKG_SECTION})) + +SUB_INSTALLS-y:= +SUB_INSTALLS-m:= +SUB_INSTALLS-${ADK_PACKAGE_LIBSDL_DEV}+= libsdl-dev-install CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --disable-esd \ @@ -33,8 +38,12 @@ CONFIGURE_ARGS+= --disable-esd \ BUILD_STYLE:= auto INSTALL_STYLE:= auto -post-install: +post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} $(INSTALL_DIR) $(IDIR_LIBSDL)/usr/lib $(CP) ${WRKINST}/usr/lib/libSDL*.so* $(IDIR_LIBSDL)/usr/lib +libsdl-dev-install: + $(INSTALL_DIR) $(IDIR_LIBSDL_DEV)/usr/include/SDL + $(CP) ${WRKINST}/usr/include/SDL/* $(IDIR_LIBSDL_DEV)/usr/include/SDL + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/vsftpd/files/vsftpd.conf b/package/vsftpd/files/vsftpd.conf index 1868be6f8..e43a5f8c0 100644 --- a/package/vsftpd/files/vsftpd.conf +++ b/package/vsftpd/files/vsftpd.conf @@ -15,3 +15,4 @@ syslog_enable=YES #xferlog_enable=YES #xferlog_file=/var/log/vsftpd.log #xferlog_std_format=YES +secure_chroot_dir=/var/run/vsftpd |