From 5514170e712b50185e914f9a31911f4249d2a3d3 Mon Sep 17 00:00:00 2001
From: Luotao Fu <l.fu@pengutronix.de>
Date: Tue, 11 Mar 2008 12:38:38 +0000
Subject: 	* fixed targetinstall stage of some netpbm utils 	*
 added xwd <-> pnm utils (useful for i.E. xprint)

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@7834 33e552b5-05e3-0310-8538-816dae2090ed
---
 rules/libnetpbm.in   | 14 ++++++++++++++
 rules/libnetpbm.make | 15 +++++++++++----
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/rules/libnetpbm.in b/rules/libnetpbm.in
index 697f50eae..6a610aa43 100644
--- a/rules/libnetpbm.in
+++ b/rules/libnetpbm.in
@@ -38,5 +38,19 @@ config LIBNETPBM_PNG2PNM
 	help
 	  Convert png images to portable anymap.
 
+config LIBNETPBM_PNM2XWD
+	bool
+	depends on LIBNETPBM
+	prompt "pnmtoxwd"
+	help
+	  Convert portable anymap to x window dump image
+
+config LIBNETPBM_XWD2PNM
+	bool
+	depends on LIBNETPBM
+	prompt "xwdtopnm"
+	help
+	  Convert x window dump image to portable anymap
+
 # FIXME: add library support (TIFF, JPEG, ...)
 
diff --git a/rules/libnetpbm.make b/rules/libnetpbm.make
index 4a7fb15d8..0dec99298 100644
--- a/rules/libnetpbm.make
+++ b/rules/libnetpbm.make
@@ -130,14 +130,21 @@ $(STATEDIR)/libnetpbm.targetinstall: $(libnetpbm_targetinstall_deps_default)
 	@$(call install_link, libnetpbm, libnetpbm.so.10.31, /usr/lib/libnetpbm.so)
 
 ifdef PTXCONF_LIBNETPBM_PBM2LJ
-	@$(call install_copy, libnetpbm, 0, 0, 0644, \
+	@$(call install_copy, libnetpbm, 0, 0, 0755, \
 		$(LIBNETPBM_DIR)/converter/pbm/pbmtolj, /usr/bin/pbmtolj)
 endif
 ifdef PTXCONF_LIBNETPBM_PPM2LJ
-	@$(call install_copy, libnetpbm, 0, 0, 0644, \
-		$(LIBNETPBM_DIR)/converter/pbm/pbmtolj, /usr/bin/pbmtolj)
+	@$(call install_copy, libnetpbm, 0, 0, 0755, \
+		$(LIBNETPBM_DIR)/converter/ppm/ppmtolj, /usr/bin/ppmtolj)
+endif
+ifdef PTXCONF_LIBNETPBM_PNM2XWD
+	@$(call install_copy, libnetpbm, 0, 0, 0755, \
+		$(LIBNETPBM_DIR)/converter/other/pnmtoxwd, /usr/bin/pnmtoxwd)
+endif
+ifdef PTXCONF_LIBNETPBM_XWD2PNM
+	@$(call install_copy, libnetpbm, 0, 0, 0755, \
+		$(LIBNETPBM_DIR)/converter/other/xwdtopnm, /usr/bin/xwdtopnm)
 endif
-
 	@$(call install_finish, libnetpbm)
 
 	@$(call touch, $@)
-- 
cgit v1.2.3