From 803b6f46676fede05f31a7250f05dc63474f191a Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Tue, 9 Oct 2007 18:55:46 +0000 Subject: [PATCH] defs.mk: Renamed FEEDFS_QT_UTILS -> FEEDFS_GUI --- make/defs.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/make/defs.mk b/make/defs.mk index edbaa14d..21ce30fd 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -631,16 +631,16 @@ INCLUDE += -I$(DSPIDER_SHARED_DIR)/include LIBFLAGS += -L$(DSPIDER_SHARED_EXE_PREFIX)/lib -ldspider-shared endif -ifeq ($(USE_FEEFDS_QT_UTILS),true) -FEEFDS_QT_UTILS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-qt-utils /opt/$(FLAVOUR_PATH_PREFIX)feedfs-qt-utils)) -FEEFDS_QT_UTILS_VERSION = $(call cat_version,$(FEEFDS_QT_UTILS_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-qt-utils-run = $(FEEFDS_QT_UTILS_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-qt-utils-devel = $(FEEFDS_QT_UTILS_VERSION) +ifeq ($(USE_FEEDFS_GUI),true) +FEEDFS_GUI_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-gui /opt/$(FLAVOUR_PATH_PREFIX)feedfs-gui)) +FEEDFS_GUI_VERSION = $(call cat_version,$(FEEDFS_GUI_DIR)) +RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-gui-run = $(FEEDFS_GUI_VERSION) +RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-gui-devel = $(FEEDFS_GUI_VERSION) USE_FEEDFS_UTILS = true USE_FEEDFS = true USE_YTOOLS = true -INCLUDE += -I$(FEEFDS_QT_UTILS_DIR)/include -LIBFLAGS += -L$(FEEFDS_QT_UTILS_DIR)/lib -lfeedfs-qt-utils +INCLUDE += -I$(FEEDFS_GUI_DIR)/include +LIBFLAGS += -L$(FEEDFS_GUI_DIR)/lib -lfeedfs-gui endif ifeq ($(USE_FEEDFS_UTILS),true)