From 6daa792eab1488d013fefc5eb7e4d01f40f38687 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 7 Feb 2010 20:03:20 +0100 Subject: change defaults for CONFIG/BUILD/INSTALL styles All packages need an update, so here is a very huge commit. Most of the 460 source packages use automatic style for configuration, building and installing. Make these styles default to "auto". If you have a package, which does not conform to this, just use manual style and add a do-$task make target. I added a new style named AUTOTOOL style, which is needed for some broken packages, which needs to be updated via autoconf or automake. I renamed CONFIGURE_STYLE to CONFIG_STYLE. Updates for some packages, which have newer upstream versions. Renaming of all package/*/extra directories. Use the directory src/ to provide overwrites of source files or to add the code, when no upstream package is available or used. src directory will be automatically used. --- package/php/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'package/php') diff --git a/package/php/Makefile b/package/php/Makefile index e8db1255f..34281b4ac 100644 --- a/package/php/Makefile +++ b/package/php/Makefile @@ -182,11 +182,11 @@ $(eval $(call PKG_mod_template,PHP_MOD_SOCKETS,sockets)) $(eval $(call PKG_mod_template,PHP_MOD_SQLITE,pdo)) $(eval $(call PKG_mod_template,PHP_MOD_XML,xml)) +INSTALL_STYLE:= manual + TLDFLAGS+= -L$(STAGING_DIR)/usr/lib/mysql CONFIGURE_ENV+= LIBS="-ldl" -CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= $(PKG_CONFIGURE_OPTS) -BUILD_STYLE:= auto do-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} ${INSTALL_DIR} $(IDIR_PHP_CLI)/etc @@ -196,6 +196,7 @@ do-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} ${INSTALL_DIR} $(IDIR_PHP_FASTCGI)/etc ${INSTALL_DATA} ./files/php.ini $(IDIR_PHP_FASTCGI)/etc/ ${INSTALL_DIR} $(IDIR_PHP_FASTCGI)/usr/sbin - ${INSTALL_BIN} $(WRKBUILD)/sapi/cgi/php-cgi $(IDIR_PHP_FASTCGI)/usr/sbin/php + ${INSTALL_BIN} $(WRKBUILD)/sapi/cgi/php-cgi \ + $(IDIR_PHP_FASTCGI)/usr/sbin/php include ${TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3