cups: cleanup cups-config handling

Includedir and rpath fixes are not needed.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/cups/cups.mk b/package/cups/cups.mk
index 7f1f52eaab9ad7a5fafb3f44ba4dc6a46f2f2465..b953a4b18d6cd47343cc9519be3badf430805151 100644 (file)
--- a/package/cups/cups.mk
+++ b/package/cups/cups.mk
@@ -55,16 +55,10 @@ CUPS_DEPENDENCIES += host-autoconf
 
 CUPS_PRE_CONFIGURE_HOOKS += CUPS_FIXUP_AUTOCONF
 
-# Fixup prefix= and exec_prefix= in cups-config, and remove the
-# -Wl,-rpath option.
+# Fixup prefix= and exec_prefix= in cups-config
 define CUPS_FIXUP_CUPS_CONFIG
-       $(SED) 's%prefix=/usr%prefix=$(STAGING_DIR)/usr%' \
-               $(STAGING_DIR)/usr/bin/cups-config
-       $(SED) 's%exec_prefix=/usr%exec_prefix=$(STAGING_DIR)/usr%' \
-               $(STAGING_DIR)/usr/bin/cups-config
-       $(SED) "s%includedir=.*%includedir=$(STAGING_DIR)/usr/include%" \
-                $(STAGING_DIR)/usr/bin/cups-config
-       $(SED) 's%-Wl,-rpath,\$${libdir}%%' \
+       $(SED) 's%^prefix=/usr%prefix=$(STAGING_DIR)/usr%' \
+               -e 's%^exec_prefix=/usr%exec_prefix=$(STAGING_DIR)/usr%' \
                $(STAGING_DIR)/usr/bin/cups-config
 endef