From 5e9d738452c357dad5a2bb43289da82e6435c08d Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Thu, 19 May 2005 21:28:39 +0000 Subject: [PATCH] Ack (definitely) name change in subpackages git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@977 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/ulogd/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package/ulogd/Makefile b/package/ulogd/Makefile index b3ce9c3536..97d49085cd 100644 --- a/package/ulogd/Makefile +++ b/package/ulogd/Makefile @@ -14,11 +14,11 @@ PKG_CAT:=bzcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -ifneq ($(BR2_PACKAGE_ULOGD_MYSQL_PLUGIN),) +ifneq ($(BR2_PACKAGE_ULOGD_MOD_MYSQL),) ULOGD_MYSQL_OPTION:=--with-mysql=$(STAGING_DIR)/usr endif -ifneq ($(BR2_PACKAGE_ULOGD_PGSQL_PLUGIN),) +ifneq ($(BR2_PACKAGE_ULOGD_MOD_PGSQL),) ULOGD_PGSQL_OPTION:=--with-pgsql=$(STAGING_DIR)/usr endif @@ -35,11 +35,11 @@ endef include $(TOPDIR)/package/rules.mk $(eval $(call PKG_template,ULOGD,ulogd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,ULOGD_MYSQL_PLUGIN,ulogd-mod-mysql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,ULOGD_PGSQL_PLUGIN,ulogd-mod-pgsql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,ULOGD_MOD_MYSQL,ulogd-mod-mysql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,ULOGD_MOD_PGSQL,ulogd-mod-pgsql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call IPKG_plugin_template,ULOGD_MYSQL_PLUGIN,MYSQL)) -$(eval $(call IPKG_plugin_template,ULOGD_PGSQL_PLUGIN,PGSQL)) +$(eval $(call IPKG_plugin_template,ULOGD_MOD_MYSQL,MYSQL)) +$(eval $(call IPKG_plugin_template,ULOGD_MOD_PGSQL,PGSQL)) $(PKG_BUILD_DIR)/.configured: (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \