summaryrefslogtreecommitdiff
path: root/package/xpdf
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2009-07-17 16:26:29 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2009-07-24 23:26:48 +0200
commit74ecbaa23da486182a1bb20b43361aaf2a478877 (patch)
tree2b884fababa50877fd39f1dc127d81446ef0bf87 /package/xpdf
parentb36a5894809b71b65da3fcfa8ba4b2a645c01194 (diff)
xorg: remove the XSERVER variable
The XSERVER variable used to be defined by package/Makefile.in because the X server package name was different depending on the type of X server that was choosen. Nowadays, the name of the package is always xserver_xorg-server, so there's no point in having this XSERVER intermediate variable. This patch makes all packages use xserver_xorg-server directly as a dependency, and removes the XSERVER variable from package/Makefile.in. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/xpdf')
-rw-r--r--package/xpdf/xpdf.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/package/xpdf/xpdf.mk b/package/xpdf/xpdf.mk
index 1f09a9d50..ab60b2be5 100644
--- a/package/xpdf/xpdf.mk
+++ b/package/xpdf/xpdf.mk
@@ -18,7 +18,7 @@ ifeq ($(BR2_SOFT_FLOAT),y)
endif
ifeq ($(BR2_PACKAGE_XORG7),y)
- XPDF_DEPENDENCIES += $(XSERVER) openmotif
+ XPDF_DEPENDENCIES += xserver_xorg-server openmotif
XPDF_CONF_OPT += --with-Xm-library=$(STAGING_DIR)/usr/lib --with-Xm-includes=$(STAGING_DIR)/usr/include/Xm \
--with-x --with-freetype2-includes=$(STAGING_DIR)/usr/include \
--with-freetype2-library=$(STAGING_DIR)/usr/lib CFLAGS="-I$(STAGING_DIR)/usr/include/freetype2" \